ERROR: merge conflict: "kind" of morphology hello-system.hello-stratum changed from stratum to chunk