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