# Conflicts: # core/src/netwerkprog/game/util/game/Character.java # core/src/netwerkprog/game/util/game/Faction.java