ADD: test merging up (f calls g, g has context)
MERGE: Merge branch 'master' of github.com:izzycecil/Paratype