diff --git a/SKIP/test.txt b/SKIP/test.txt
index 634aa30..dbd5b26 100644
--- a/SKIP/test.txt
+++ b/SKIP/test.txt
@@ -1,8 +1,17 @@
 tesuto
+<<<<<<< HEAD
 git sssssssss
 tanosiisagyo------
 
 
 aaaaa
 bbbbbb
-scccscdsafdsafcafsa
\ No newline at end of file
+scccscdsafdsafcafsa
+=======
+git naretai
+tanosiisagyo------
+
+hennkou
+1
+da
+>>>>>>> 01293931a23b12ff5fbb770bc1c7f1f260777b8c