merge changes in