Unclobber trashed xml from merge