merge changes files