diff --git a/README.md b/README.md
index bc1f149..34f94ff 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
 Practice
 ====
+
+~/.emacs に足せ!
+````
+(setq make-backup-files nil)
+````
+
 Are you enjoy git life ?
 This repository is for git practice.
 
-<<<<<<< HEAD
-=======
 hogehoge
 
 ### process push
@@ -14,12 +18,7 @@
 * git add hoge/hoge.file 
 * git commit -m "hogehoge"
 * git push
-<<<<<<< HEAD
->>>>>>> ac455413edae60201a4d373965b37f843025223f
-=======
 
-#### 誰かが push した後は pull する
-* git pull 
 
 |git push|アップロード|
 |----|----|
@@ -30,4 +29,3 @@
 | Left align | Right align | Center align |
 |:-----------|------------:|:------------:|
 |左|右|中央|
->>>>>>> 5eeb773ad7d0d42f15d572384ba58480fa590edc
diff --git a/sasaki.txt b/sasaki.txt
new file mode 100644
index 0000000..c969a48
--- /dev/null
+++ b/sasaki.txt
@@ -0,0 +1 @@
+佐々木だよ
diff --git a/zemigashuku2018/README.md b/zemigashuku2018/README.md
new file mode 100644
index 0000000..afbd153
--- /dev/null
+++ b/zemigashuku2018/README.md
@@ -0,0 +1,2 @@
+###持ち物
+###日程
\ No newline at end of file