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