# Conflicts: # src/main/java/com/example/demo/app/presentation/controller/UserController.java # src/main/resources/templates/login.html # src/main/resources/templates/password_reset.html
# Conflicts: # src/main/java/com/example/demo/app/presentation/controller/UserController.java # src/main/resources/templates/login.html # src/main/resources/templates/password_reset.html