Added patient adding
fixed merge conflict?