Undoing merge/rollback issues