mellmann/mergetest

This is a playground for merge tests and conflict resolution experiments