finished rollback of bad merge