merge conflict fixes
Merge branch 'patient_search'