1 changed files with 1 additions and 7 deletions
--- a/test.txt
+++ b/test.txt
@ -1,7 +1 @@
-<<<<<<< HEAD
+Fh0vxCr
 RSskzSm
 ||||||| ae78e39
 Kkjc8AP
 =======
 Fh0vxCr
 >>>>>>> 92ca8c6ec7d6c0fa4b4ca46d910a6f947e2851b1