Fix to a merge error