diff --git a/README.md b/README.md
index 34ff3bc..1d3e889 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,10 @@
+<<<<<<< HEAD
 #kitteh wiki
 simple wiki for thsf site
 
 
+=======
+###wiki tshf 
+
+this is thsf wiki, all datas here are public.
+>>>>>>> 22a89ddac499fcafc0cabd1b0df2a39b6bd794ac
diff --git a/index b/index
new file mode 100644
index 0000000..6499642
--- /dev/null
+++ b/index
@@ -0,0 +1,3 @@
+###Hello THSF
+
+![](http://stuffpoint.com/lol-cats/image/29077-lol-cats-magical-kitteh.png)