add explicit merge2
Merge branch 'master' of https://github.com/apunktbau/co4