diff --git a/zemi_member/meibo.txt b/zemi_member/meibo.txt
index f6cf908..60204ce 100644
--- a/zemi_member/meibo.txt
+++ b/zemi_member/meibo.txt
@@ -1 +1,6 @@
+<<<<<<< HEAD
 C1160818 佐々木大器//
+=======
+C1160818 佐々木大器.
+
+>>>>>>> sasaki