diff --git a/build.gradle b/build.gradle
index cab1fc3..3048746 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,13 +63,8 @@ allprojects {
     }
 
     dependencies {
-<<<<<<< HEAD
         compileOnly 'com.willfp:eco:6.48.0'
         implementation 'com.willfp:libreforge:3.128.0'
-=======
-        compileOnly 'com.willfp:eco:6.44.0'
-        implementation 'com.willfp:libreforge:3.128.0'
->>>>>>> cb4e77d9e83547c9726a3d68cedaec90d334f379
         implementation 'org.joml:joml:1.10.4'
         implementation 'com.willfp:ecomponent:1.3.0'
 
diff --git a/gradle.properties b/gradle.properties
index 176c4cc..3d220c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,4 @@
 #libreforge-updater
 #Tue Jan 24 10:09:26 GMT 2023
-=\=\=\=\=\=\=
->>>>>>>=cb4e77d9e83547c9726a3d68cedaec90d334f379
 version=5.137.0
-<<<<<<<=HEAD
 plugin-name=Talismans