diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793a84b44ca4cfb911a13deaab8ea20589f..f3c5537a210169360bc8ee92ac3b6b7066d1a0c5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,10 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+<<<<<<< HEAD
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+=======
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+>>>>>>> d8c5d2041743498991a5e1d2c6fbd928a38be9f9
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java b/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
index eafcda54a61c9c2f68467ad4059001f3ba60d66c..116f0d256c1fa11a9fb2378fa074bbc985220f5e 100644
--- a/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
+++ b/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
@@ -1,6 +1,10 @@
 package nl.utwente.soa.sampleWebapplication.services;
 
 import jakarta.websocket.EncodeException;
+<<<<<<< HEAD
+=======
+
+>>>>>>> d8c5d2041743498991a5e1d2c6fbd928a38be9f9
 import java.io.IOException;
 
 public interface EchoProxyService {
diff --git a/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java b/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
index 7c6ce2469213101b6770cb0be1204f80a7ac8416..dc7f3504877c9636810d77ff822865acfbc5307d 100644
--- a/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
+++ b/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
@@ -1,5 +1,6 @@
 package nl.utwente.soa.sampleWebapplication.web;
 
+import jakarta.websocket.EncodeException;
 import nl.utwente.soa.sampleWebapplication.services.EchoProxyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -10,7 +11,10 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+<<<<<<< HEAD
 import jakarta.websocket.EncodeException;
+=======
+>>>>>>> d8c5d2041743498991a5e1d2c6fbd928a38be9f9
 import java.io.IOException;
 
 @Controller
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 0742c2e4d92178fcdcabc485afedd4fb17894611..22542e10322b3e66bb8730a136d5e1a3604d3ae1 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1 @@
-server.tomcat.max-threads = 3
\ No newline at end of file
+server.tomcat.threads.max=3
\ No newline at end of file