manual merge cr