Fixed a mergeError