Fix an improper merge.