diff --git a/README.md b/README.md
index f5697ee..9bef746 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,12 @@
 # HOESx1
 
-<<<<<<< HEAD
+HEAD
 HOESx1 is an operating system running on hexcasting inside minecraft
-=======
-HOESx1 is an operating system running on hexcasting inside minecraft
->>>>>>> 8c8d3dbb1559a05ef8bfc5f5087dc2180b4f9389
+target minecraft version: fabirc 1.20.1
+target hexcasting version: 0.11.4
+required addons:
+    - hexcassettes (1.1.4)
+    - hexcellular (1.1.1)
+    - moreiotas (0.1.2)
+    - hexthings (0.2.0)
+meow meow