fix conquest battle filter

fix conquest battle filter
Merge pull request #137 from Bonbons/patch-10

fix conquest battle filter