removed contentConflict(), which got killed by the streams
removed contentConflict(), which got killed by the streams

fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary