merge changes into common