diff --git a/test.cpp b/test.cpp
index 9a682cd..5dba101 100644
--- a/test.cpp
+++ b/test.cpp
@@ -1 +1,5 @@
-1111333333
\ No newline at end of file
+<<<<<<< HEAD
+1111
+=======
+1111333333
+>>>>>>> master