diff --git a/README.md b/README.md
index 1277803..f5697ee 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
 # HOESx1
 
+<<<<<<< HEAD
 HOESx1 is an operating system running on hexcasting inside minecraft
+=======
+HOESx1 is an operating system running on hexcasting inside minecraft
+>>>>>>> 8c8d3dbb1559a05ef8bfc5f5087dc2180b4f9389