fixing merging issues