+ Stubbing out a change to get the build command to show a conflict graph.
+ Tidy up the implementation and rename a few things.