Fixed error in merge.