Merging changes.