fixing merging issue