diff --git a/README.md b/README.md
index 31b9a4c..f241b3e 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-# First Robotics Lab
-=======
 # First Robotics Lab 
 
 
-
->>>>>>> develop
-