fix of merging