# Conflicts: # src/main/java/com/faf223/expensetrackerfaf/controllers/MainController.java # src/main/resources/application.properties