Check battle is over
Merge branch 'battle-end'