Battles now resolve in the right way