mention file conflict, replacefiles and rollback changes
mention file conflict, replacefiles and rollback changes


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