Battlefield buttons
Fix conflicts