add button for player
fix merge