take out xen_conflicts for now