- fixed merging