# Conflicts: # client/app/src/main/resources/main/main-view.css # client/app/src/main/resources/main/main-view.fxml