diff --git a/README.md b/README.md
index 9e7d03700..e25009fea 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,9 @@
 # git-practice
-このリポジトリはGit動画講座用です．
+このリポジトリはGit動画講座用です。  
+2026/03/15 12:30 GitHub上で更新  
+<<<<<<< HEAD
+2026/03/15 12:46 リモートリポで更新(コンフリクト発生)  
+aaaaa  
+2026/03/15 13:13 merge conflict test 2  
+2026/03/15 13:19 merge conflict test 3  
+2026/03/15 13:49 new-feature-2(ローカルリポ) で更新  
diff --git a/delete_soon.txt b/delete_soon.txt
new file mode 100644
index 000000000..7b83796ba
--- /dev/null
+++ b/delete_soon.txt
@@ -0,0 +1 @@
+削除されます。
\ No newline at end of file
diff --git a/namechanged2.txt b/namechanged2.txt
new file mode 100644
index 000000000..9b6a87add
--- /dev/null
+++ b/namechanged2.txt
@@ -0,0 +1 @@
+名前変更済み
\ No newline at end of file
diff --git a/newfile.txt b/newfile.txt
new file mode 100644
index 000000000..12bcfa88a
--- /dev/null
+++ b/newfile.txt
@@ -0,0 +1 @@
+created new file !!