Fixed up a merge error