Corrections before attempting to write a sensible merge.