merge the changes.