# Conflicts: # MonitorPatientStatus/src/main/java/com/example/monitorpatientstatus/controller/LoginController.java