fixing merging problem