fixed merging
fixed merging