Rollback previous merge