Fix what looks like a merge error