Merge properly