correcting a bad merge