Improve conquest_delay resetting