diff --git a/Haas_Next_Generation/README.txt b/Haas_Next_Generation/README.txt
index 3bb58f8..781f23b 100644
--- a/Haas_Next_Generation/README.txt
+++ b/Haas_Next_Generation/README.txt
@@ -37,8 +37,4 @@ General notes:
 
 - Some optional portions were commented out, specifically those associated with safe start.
 
-<<<<<<< HEAD
-- Potential TODO is to remove as much halting from QA as possible
-=======
 - Macro references can be found on page 189 of the milling manual
->>>>>>> Development