merge properly