XML diff and merge

XML diff and merge