Fixed an merge error