diff --git a/TEST.txt b/TEST.txt
index 93a3bb1..360db59 100644
--- a/TEST.txt
+++ b/TEST.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 New test123
-=======
-New test
 
 In v2
->>>>>>> v2
diff --git a/dd.txt b/dd.txt
index 73c1790..30d74d2 100644
--- a/dd.txt
+++ b/dd.txt
@@ -1 +1 @@
-tset
\ No newline at end of file
+test
\ No newline at end of file