Generalize VersionGraph for easy specialization of Version-type
Test conflicts and different kinds of merges