fixed mergeError