diff --git a/README.md b/README.md
index d1d6148..a8164bf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-# TouchPrint
-TouchPrint is a lightweight fork of Raspberry Pi OS whos purpose is to host OctoPrint and to display it on a connected screen.
 TouchPrint is very customizable, and both the GUI and/or OctoPrint can be disabled if you already have an existing setup to perform those tasks.
 
 # Table of Contents