diff --git a/test.txt b/test.txt
index 42f0cac..a4b5469 100644
--- a/test.txt
+++ b/test.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
 RSskzSm
-||||||| ae78e39
-Kkjc8AP
-=======
-Fh0vxCr
->>>>>>> 92ca8c6ec7d6c0fa4b4ca46d910a6f947e2851b1