# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
#   src/main/resources/player/appSettings.json