Merge conflicts in test:morphs: hello-stratum.morph