merging issues fixed