Fix manual merge.