Add option to Makefile to generate conflict files + .dot graph
Forgot to add ".dot" files to remove