add remove player, add load next level
merge conflict