Manually merge msoucy.yaml. Fixes #320