fixing multiplayer.java merge problems