'fixing merge conflict for patient table heading
Merge branch 'patient_table'