commit after rollback + manual merge