manual merge complete