fixed the merging issue