diff --git a/test_file b/test_file
index 180cf8328022b..248a88106bd87 100644
--- a/test_file
+++ b/test_file
@@ -1 +1,5 @@
+<<<<<<< HEAD
 test2
+=======
+test
+>>>>>>> d24b26aee0b (Add content to test_file (#552) (#563))