patient's edit and view profile
conflict resolved
conflict resolved
modifications
merge conflicts
conflict resolved