resolved conflit on player.mat