merge changes