Merge correctly