Fixed a merge error