diff --git a/docs/index.html b/docs/index.html
index cab09f9..039314a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -50,7 +50,11 @@ <h2> 주의사항</h2>
 			<div class="user_pr">
 				<h2>PR 실습 결과</h2>
 				<!-- 아래에 붙여넣고 코멘트 작성해주세요 -->
+<<<<<<< HEAD
+				<paper-material elevation="2"><p id="PR_MSG">도넛 다 먹어버리기.<@yemi___></p></paper-material>
+=======
 	<paper-material elevation="2"><p id="PR_MSG">very hard<@new_git></p></paper-material>
+>>>>>>> 390f81a6b37dd2196e4365edb90f0faeff0201ab
 				<paper-material elevation="2"><p id="PR_MSG">이윤철입니다. <@yunchurlee></p></paper-material>
 				<paper-material elevation="2"><p id="PR_MSG">오늘도뇌찢어짐ㅠㅠ<eunbitjang></p></paper-material>
 				<paper-material elevation="2"><p id="PR_MSG">저는 이미희입니다! 제 첫번째 풀리퀘!!<@Mihee Lee></p></paper-material>