manual merge corections