# Conflicts: # src/main/java/mops/gruppen2/service/ControllerService.java # src/main/resources/schema.sql