# Conflicts: # Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java