WIP towards extensible merge CG
7 files changed