rollback merge