removed conflicts got while pulling branch from remote machine
removed conflicts got while pulling branch from remote machine

Nithanaroy/patient-healthcare-portal,Nithanaroy/patient-healthcare-portal,Nithanaroy/patient-healthcare-portal