fixed merging issues 2