diff --git a/README.md b/README.md
index d201922..bc5436c 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,8 @@ Feddie
 
 Harrison Shoebridge (@paked)
 Jack Reichelt (jackreichelt)
-<<<<<<< HEAD
 Benjamin Jelavic
-=======
 David (@auscompgeek)
->>>>>>> origin/master
 Rob Pike