fix error of merging