Resolve Merge Conflict in Appointment Model