update manual merge