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