diff --git a/README.md b/README.md
index 20f6456..4598195 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
-# Sthope.dev examples and templates
-=======
 # Sthope.dev
->>>>>>> ec2f9d52c1c5cdfbb0c70f0e6d62b0bd872e37e7