Merge with local changes.