diff --git a/src/main/resources/templates/fixed_cost_create.html b/src/main/resources/templates/fixed_cost_create.html
index 0c478d1..8217b49 100644
--- a/src/main/resources/templates/fixed_cost_create.html
+++ b/src/main/resources/templates/fixed_cost_create.html
@@ -37,7 +37,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType">
+						<select class="form-select" id="transactionType" required>
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>
@@ -51,7 +51,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryId">カテゴリ</label>
 
-						<select class="form-select" id="categoryId" th:field="*{categoryId}">
+						<select class="form-select" id="categoryId" th:field="*{categoryId}" required>
 							<option value="">選択してください</option>
 
 							<option class="expenseListClass" th:each="category : ${expenseList}"
diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index 35a6f6b..88419b5 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">
@@ -22,17 +21,9 @@
 				</button>
 		    </form>
 	    </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>
-		</form>
 
 	</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">