Commiting all the latest changes to Appointments
Conflicts fixed