diff --git a/chanfumi.txt b/chanfumi.txt
index 1b0346a..a7d79c0 100644
--- a/chanfumi.txt
+++ b/chanfumi.txt
@@ -1,4 +1,14 @@
 ☆フミちゃん☆参上
+<<<<<<< HEAD
 あああああ
-コミットするぞー
+コミットするぞーおー
 やらかし
+=======
+iiiiiiiiii
+コミットするぞー
+やらかしway
+<<<<<<< HEAD
+>>>>>>> fumipractice
+=======
+fumican
+>>>>>>> fumipractice
diff --git a/fumifumi.txt b/fumifumi.txt
new file mode 100644
index 0000000..028873d
--- /dev/null
+++ b/fumifumi.txt
@@ -0,0 +1,2 @@
+aaaaaaaaaa
+iiiiiiiii
diff --git "a/html5_css3/.\043rinkou4-3.html" "b/html5_css3/.\043rinkou4-3.html"
deleted file mode 120000
index c68c05d..0000000
--- "a/html5_css3/.\043rinkou4-3.html"
+++ /dev/null
@@ -1 +0,0 @@
-sairen78@Inori-Minase.10675:1563063115
\ No newline at end of file
diff --git "a/html5_css3/.\043rinkou4-4.html" "b/html5_css3/.\043rinkou4-4.html"
deleted file mode 120000
index c68c05d..0000000
--- "a/html5_css3/.\043rinkou4-4.html"
+++ /dev/null
@@ -1 +0,0 @@
-sairen78@Inori-Minase.10675:1563063115
\ No newline at end of file
diff --git "a/html5_css3/.\043table3.css" "b/html5_css3/.\043table3.css"
deleted file mode 120000
index c68c05d..0000000
--- "a/html5_css3/.\043table3.css"
+++ /dev/null
@@ -1 +0,0 @@
-sairen78@Inori-Minase.10675:1563063115
\ No newline at end of file