fix conflicts

nbproject/project.properties

@@ -72,7 +72,8 @@ javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
     ${file.reference.junit-jupiter-api-5.7.0.jar}:\
-    ${file.reference.junit-jupiter-engine-5.7.0.jar}
+    ${file.reference.junit-jupiter-engine-5.7.0.jar}:\
+    ${libs.junit_5.classpath}
 javac.test.modulepath=\
     ${javac.modulepath}
 javac.test.processorpath=\

src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java

@@ -31,7 +31,7 @@ public class EntityTypeFactory
       return null;
     
     try {
-      Class cls = Class.forName(name);
+      Class<?> cls = Class.forName(name);
       Constructor<EntityType> constr = (Constructor<EntityType>) cls.getConstructors()[0];
       return constr.newInstance();
     }

src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java

@@ -10,7 +10,7 @@ import java.io.*;
 import edu.nps.moves.dis7.enumerations.*;
 
 /**
- *  7.2.2. Represents the postion and state of one entity in the world. See 5.3.2.
+ *  7.2.2. Represents the position and state of one entity in the world. See 5.3.2.
  * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
  */
 public class EntityStatePdu extends EntityInformationFamilyPdu implements Serializable

src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java

@@ -10,7 +10,7 @@ import java.io.*;
 import edu.nps.moves.dis7.enumerations.*;
 
 /**
- * Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
+ * Represents the position and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
  * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
  */
 public class FastEntityStatePdu extends EntityInformationFamilyPdu implements Serializable

src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java

@@ -4,8 +4,9 @@
  */
 package edu.nps.moves.dis7.pdus;
 
-import java.io.*;
 import edu.nps.moves.dis7.enumerations.*;
+
+import java.io.*;
 import java.util.Arrays;
 
 /**
@@ -197,7 +198,7 @@ public class VariableDatum extends Object implements Serializable
       //uPosition += padding.length;
     }
     catch (Exception e) {
-      System.out.println(e);
+      System.err.println(e);
     }
     return getMarshalledSize();
   }