ERROR: merge conflict: "kind" of morphology hello-stratum