resolve conflicts for the merging

.gitignore

@@ -5,6 +5,8 @@
 /.classpath
 /.project
 /.settings/
+/engines/
+/models/
 
 # Log file
 *.log
@@ -26,3 +28,7 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# Idea files
+.idea/
+lib/

pom.xml

@@ -5,13 +5,17 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>31.1.0</version>
+		<version>35.1.1</version>
 		<relativePath />
 	</parent>
 
 	<groupId>io.github.deepimagej</groupId>
 	<artifactId>DeepImageJ_</artifactId>
+<<<<<<< HEAD
 	<version>2.1.16</version>
+=======
+	<version>3.0.1</version>
+>>>>>>> development
 
 	<name>DeepImageJ</name>
 	<description>A user-friendly plugin to run deep learning models in ImageJ.</description>
@@ -127,10 +131,7 @@ Universidad Carlos III de Madrid.</license.copyrightOwners>
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>deploy-to-scijava</releaseProfiles>
 
-		<protobuf.version>3.2.0</protobuf.version>
-		<tensorflow.version>1.15.0</tensorflow.version>
 		<jna.version>5.11.0</jna.version>
-		<imagej-tensorflow.version>1.1.6</imagej-tensorflow.version>
 	</properties>
 	<repositories>
 		<repository>
@@ -140,35 +141,23 @@ Universidad Carlos III de Madrid.</license.copyrightOwners>
 	</repositories>
 
 	<dependencies>
+<!--		MODEL RUNNER-->
 		<dependency>
-			<groupId>com.google.protobuf</groupId>
-			<artifactId>protobuf-java</artifactId>
-			<version>${protobuf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.tensorflow</groupId>
-			<artifactId>proto</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.tensorflow</groupId>
-			<artifactId>libtensorflow</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.tensorflow</groupId>
-			<artifactId>libtensorflow_jni</artifactId>
+			<groupId>io.bioimage</groupId>
+			<artifactId>dl-modelrunner</artifactId>
+			<version>0.3.10</version>
 		</dependency>
+<!--		MODEL RUNNER-->
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
 		</dependency>
-		<dependency>
-		    <groupId>net.imagej</groupId>
-		    <artifactId>imagej-tensorflow</artifactId>
-		</dependency>
+
 		<dependency>
 			<groupId>net.imagej</groupId>
 			<artifactId>ij</artifactId>
 		</dependency>
+<<<<<<< HEAD
 		<!--  Dependencies for DJL Pytorch, START -->
 		<dependency>
 			<groupId>ai.djl.pytorch</groupId>
@@ -208,12 +197,13 @@ Universidad Carlos III de Madrid.</license.copyrightOwners>
 		    <groupId>org.jetbrains.kotlin</groupId>
 		    <artifactId>kotlin-stdlib</artifactId>
 		</dependency>	
+=======
+>>>>>>> development
 		<!-- Test scope dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 </project>