diff --git a/test.txt b/test.txt
index 9e11af61a69145900c251abb556ed0d0b1c52290..5a346443a784f1a36fb947ee15da7586bf2703ff 100644
--- a/test.txt
+++ b/test.txt
@@ -1,6 +1 @@
-5412
-<<<<<<< HEAD
-1
-=======
-123
->>>>>>> 1d7745d83710d9e1176c1ca38b653a6eb5e5e9b5
+37851
\ No newline at end of file