diff --git a/conflict b/conflict
index 9b1719f..e4f3582 100644
--- a/conflict
+++ b/conflict
@@ -1 +1,5 @@
+<<<<<<< HEAD
 conflict
+=======
+This will conflict
+>>>>>>> 3457521 (Add a change that will conflict)