changes to player
resolved merge errors