updates for patient table
solve conflicts