merge changes.