Commit before manual merge