fixed merging problem