diff --git a/README.md b/README.md
index 92eca93..07ce862 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
 # gittest
+<<<<<<< HEAD
+=======
+This is for test
+>>>>>>> 4c04d7500b637e504122472052d78b857070461c
diff --git a/test b/test
new file mode 100644
index 0000000..1f61e4c
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+jhahdjkatest
diff --git a/test.txt b/test.txt
deleted file mode 100644
index 0de21f5..0000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-hi am git