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