fix resuming a killed merge condition.