manual merge2