Resolve merge conflicts.

Author: RaMisess

tools/bamm-cli/src/test/java/io/openmanufacturing/sds/ApplicationIntegrationTest.java

@@ -40,7 +40,7 @@
 
 import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
 import io.openmanufacturing.sds.aspectmodel.java.exception.CodeGenerationException;
-import io.openmanufacturing.sds.exeption.CommandException;
+import io.openmanufacturing.sds.exception.CommandException;
 import io.openmanufacturing.sds.test.MetaModelVersions;
 import io.openmanufacturing.sds.test.TestAspect;
 import picocli.CommandLine;