make the xml values for conflict and type a bit nicer