Fix problems after merge.
Fix problems after merge.

sebastianhaas/medical-appointment-scheduling,sebastianhaas/medical-appointment-scheduling,sebastianhaas/medical-appointment-scheduling,sebastianhaas/medical-appointment-scheduling