fixed conflicts
fixed conflicts

aditya-simplecrm/iosReactAppNoresha,aditya-simplecrm/iosReactAppNoresha,aditya-simplecrm/iosReactAppNoresha,aditya-simplecrm/iosReactAppNoresha,aditya-simplecrm/iosReactAppNoresha