- fixed minor bugs
 - fixed battle settings merge
 - fixed missing events