manual merge finished