# Conflicts: # src/GUI/ChatScreen.java # src/client/Client.java # src/server/ClientController.java # src/server/User.java
