manual merge