diff --git a/basic-merge.md b/basic-merge.md
index e8f3c60d61d2872f725707930505b843d63d9fe4..6d9b7738933c549541e9ea9f29e866e39157b3c2 100644
--- a/basic-merge.md
+++ b/basic-merge.md
@@ -1,2 +1,4 @@
+<<<<<<< basic-merge.md
 201920803 한지혁
 201920738 정의엽
+201920775 이선제