conflict code tweaks and cleanups

We can take advantage of a few things on our new and improved filelist
in this code.

Signed-off-by: Dan McGee <dan@archlinux.org>

0 files changed, 0 insertions, 0 deletions