Fix manual merge