diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index def2da6..15f60b7 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -70,23 +70,6 @@ $routes->group('manage', ['namespace' => 'App\Controllers\Manage'], function ($r
     $routes->get('user/excel', 'User::excel');
     $routes->post('user/saveSms', 'User::saveSms');
 
-<<<<<<< HEAD
-$routes->get('/manage/loginlog/getLogList', 'Manage\LoginLog::getLogList'); // 로그 목록 조회
-$routes->get('/manage/loginlog/excel', 'Manage\LoginLog::excel'); // 엑셀다운로드
-
-
-/*
- * --------------------------------------------------------------------
- * Additional Routing
- * --------------------------------------------------------------------
- *
- * 이 영역에서 다른 라우트 파일을 로드할 수 있습니다.
- */
-
-if (is_file($filepath = APPPATH . 'Config/Routes/Api.php')) {
-    require $filepath;
-}
-=======
     /** API - 조직관리 */
     $routes->get('dept/getDeptList', 'Dept::getDeptList');
     $routes->get('dept/getUserList', 'Dept::getUserList');
@@ -127,4 +110,3 @@ if (is_file($filepath = APPPATH . 'Config/Routes/Api.php')) {
  * 로그인 API
  */
 $routes->post('/login/chkLogin', 'Login::chkLogin');
->>>>>>> feature/template