Fix CC in find battle
Merge remote-tracking branch 'main/master'