diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index 35a6f6b..e2a5b43 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -13,7 +13,6 @@
 	<div th:replace="~{header :: header}"></div>
 	<h1 class="page-title">コース選択</h1>
 
-<<<<<<< HEAD
 	<div class="d-grid gap-2 mt-4">
 	    <th:block th:if="${mode == 'change'}">
 		    <form th:action="@{/course/create}" method="get">
@@ -24,7 +23,6 @@
 	    </th:block>
 	
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
-=======
 	<th:block th:if="${mode == 'change'}">
 		<form th:action="@{/course/create}" method="get">
 			<button type="submit">新規登録</button>
@@ -32,7 +30,6 @@
 
 	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">
->>>>>>> 65b4a9e54a5bc5c1d1480fd4b9255addf73628e4
 		<button type="submit" class="btn btn-primary w-100">確定</button>
 
 		<div class="accordion" id="accordionExample">