XML diff and merge