UHM-1050 Update service to get scheduled appointments to filter by service type
Fix merge conflicts