merging issue solved