merging battles now. ish