worked on the patients list page
conflict fixed
additional features
resolved conflict