complete merge with doctor_registration