Reshma - Appointments after changes in db
REshma - resolving conflict
Merge