diff --git a/file.txt b/file.txt
index 29250c9..d00feae 100644
--- a/file.txt
+++ b/file.txt
@@ -1,6 +1,6 @@
 1
 <<<<<<< HEAD
+2
 3
->>>>>>> bb2d8f14ee105557e0df25b7e8f35d8558cb2e97
-3
-4
+<<<<<<< HEAD
+