Fixed error of merging