Deleted my conflict scanner

I had just started the conflicts scanner, now that you have it done,
there is no reason to keep it around.