Remove Conflict2Diff submodule

vim on *nix doesn't like the dos line endings