# Conflicts: # src/main/java/cz/fi/muni/pa165/entity/PlayerEntity.java # src/main/java/cz/fi/muni/pa165/entity/TeamEntity.java # src/main/java/cz/fi/muni/pa165/entity/TeamManagerEntity.java