Fix Merging issue