diff --git a/test.txt b/test.txt
index d6e8c2f..42f0cac 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1,7 @@
-RSskzSm
\ No newline at end of file
+<<<<<<< HEAD
+RSskzSm
+||||||| ae78e39
+Kkjc8AP
+=======
+Fh0vxCr
+>>>>>>> 92ca8c6ec7d6c0fa4b4ca46d910a6f947e2851b1