diff --git a/README.md b/README.md
index 7c72771..4700181 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,2 @@
-<<<<<<< Updated upstream
-# Smart Leaves
-=======
 # Cull Leaves
->>>>>>> Stashed changes
 Adds culling to leaf blocks, providing a huge performance boost over vanilla.