Patient list and update patient information
merge conflicts