diff --git a/test.txt b/test.txt
index 1b054ef..063426a 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1,7 @@
-VFxcfXh
\ No newline at end of file
+<<<<<<< HEAD
+VFxcfXh
+||||||| 2f84e9c
+55uUjTE
+=======
+Kkjc8AP
+>>>>>>> ae78e3913f4ae685b37347bfe885683924176b7f