fixing merging