fixing merge error for patient table heading