merge player.java