diff --git a/test.txt b/test.txt
index a889559..3e95f3a 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1,7 @@
-HgsnZm4
\ No newline at end of file
+<<<<<<< HEAD
+HgsnZm4
+||||||| 6af43c2
+RSskzSm
+=======
+XKKs9Q7
+>>>>>>> 716f5b285f739649e93f8898c63926beedce02b3