Fix manual merge issue