merge del player.cs