diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b6abcc..00ef412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ### All of Fabric 4 | v1.1.4
 
 _Fabric Loader 0.12.12_
@@ -24,8 +23,6 @@ _Fabric Loader 0.12.12_
 
 ---
 
-=======
->>>>>>> main
 <h1>1.1.3</h1>
 
 <h2>Be sure to always backup your world(s) before updating!</h2>