diff --git a/README.md b/README.md
index 6b0d9ddf7ea45162756e3c72db6f283d57f1b105..c73e85fd776eb129b8b019ad252673da744f1fba 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
 # Git Laboratory
 some changes
+<<<<<<< HEAD
 This will also cause a conflict.
+=======
+This will cause a conflict.
+>>>>>>> conflict-branch