diff --git a/README.md b/README.md
index 36b2a26..598d6aa 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Lab5
 ================
 Patrick Casanas