diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..f0de82f57
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+output.log
\ No newline at end of file
diff --git a/READ.md b/READ.md
new file mode 100644
index 000000000..0d2b053fe
--- /dev/null
+++ b/READ.md
@@ -0,0 +1,3 @@
+conflict
+ブランチで変更
+
diff --git a/README.md b/README.md
index 9e7d03700..688075deb 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # git-practice
-このリポジトリはGit動画講座用です．
+ローカル練習用
+自分のリポジトリで更新
diff --git a/delete_soon.txt b/delete_soon.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/namechanged2.text b/namechanged2.text
new file mode 100644
index 000000000..5f25aa713
--- /dev/null
+++ b/namechanged2.text
@@ -0,0 +1 @@
+9mon 作成
\ No newline at end of file
diff --git a/newfile.txt b/newfile.txt
new file mode 100644
index 000000000..14c2235f9
--- /dev/null
+++ b/newfile.txt
@@ -0,0 +1 @@
+0mon OK
\ No newline at end of file