diff --git a/README.txt b/README.txt
index 805a1b64903ad3ccd2e9c3e494e28d2b2f2fa11b..066203d9766f7626393fbfc39febdfc4649d6e84 100644
--- a/README.txt
+++ b/README.txt
@@ -9,8 +9,6 @@ _________________________
 1.  Make sure you are in the correct folder where the file is located.
 2.  Update the text file for your Campus with the switches that you would like to work with.
 3.  type in "python3 flipport.py"  to run the flipport.py script.
-<<<<<<< HEAD
 4.  Enter your information and let the script run.
 =======
-4.  Enter your information and let the script run.
->>>>>>> 9393f8584d3450a0989c88b14218a2ed1ef634c5
+