fixed merging issues
fixed merging issues