Core/Battleground: Fix merge fail (thx @joschiwald)