fixed merging issues