diff --git a/build.gradle b/build.gradle
index 812fafcc7c97cedd6d47627399d8bba280154f5b..934a22cb9265c146a0b17e2521dc49272f918730 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'nl.utwente.soa'
-version = '0.0.1-SNAPSHOT'
+version = '0.0.1'
 
 repositories {
     mavenCentral()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f3c5537a210169360bc8ee92ac3b6b7066d1a0c5..cea7a793a84b44ca4cfb911a13deaab8ea20589f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,10 +1,6 @@
 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 116f0d256c1fa11a9fb2378fa074bbc985220f5e..eafcda54a61c9c2f68467ad4059001f3ba60d66c 100644
--- a/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
+++ b/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
@@ -1,10 +1,6 @@
 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 dc7f3504877c9636810d77ff822865acfbc5307d..7c6ce2469213101b6770cb0be1204f80a7ac8416 100644
--- a/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
+++ b/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
@@ -1,6 +1,5 @@
 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;
@@ -11,10 +10,7 @@ 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