Core/Battleground: Fix merge fail