diff --git a/README.md b/README.md
index 9e3ba4f..fe1317e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # TactiTerm
 
+<<<<<<< HEAD
 **Tactile Terminal:** A WebUI / TUI built to help teach and study programming concepts in an interactive, hands-on way.
 
 ---
@@ -131,3 +132,6 @@ When initialized, TactiTerm automatically generates a `config.json` file in the
 ## 📜 License
 
 MIT License. See `LICENSE` for details.
+=======
+Tactile Terminal: A WebUI / TUI built to help teach and and study programming concepts in an interactive way.
+>>>>>>> branch 'main' of https://git.dewm.ca/dewm/TactiTerm.git