loop game
fix merging battle