From 1ff0ede6cd2e5f1f33b83c97d1183b397e93c65e Mon Sep 17 00:00:00 2001
From: saru <sarushinobie@proton.me>
Date: Mon, 21 Oct 2024 20:38:27 -0500
Subject: [PATCH] update README.md and fix merge conflicts

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ae31703..8572cb5 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,8 @@
 
 # Description
 This repository contains all the mods running on lobotomy land, their associated links, and their descriptions - it shouldn't update often.
-
-<<<<<<< HEAD
-
+ 
 # Major Content 
-=======
-## Major Content 
->>>>>>> 3959f799a31f6a068dd47e0367d9745e2849cffe
 
 ### [Create](https://modrinth.com/mod/create-fabric)
 Create mod base. Adds far too many features to cover here.