diff --git a/README.md b/README.md
index 0dfe708..1718a81 100755
--- a/README.md
+++ b/README.md
@@ -8,9 +8,14 @@
-
+<<<<<<< Updated upstream
+=======
+
+
+
+>>>>>>> Stashed changes
Jade is the backend and TUI installer for crystal linux.