Merge battle with UI + clean up