diff --git a/README.md b/README.md
index db2e62a..f4eaf97 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,5 @@ Thgis is a test Repo for educational purposes
 test
 hallo<br>
 hallo2
-<<<<<<< HEAD
 auch hallo
-=======
 test
->>>>>>> origin/master