manual merge overwrite