Fix manual merge error