Fix _oasis metadata
Add a (failing) high-level merge test
Fix the graph generation
Fix the high-level merges

All the unit-tests pass again \o/
Fix the example