return conflicyting hunks rather then throwing an exception
return conflicyting hunks rather then throwing an exception

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