UHM-1172 Fix merge conflicts
UHM-1172 Fix merge conflicts
UHM-1172 Appointment status resource