diff --git a/adm/admin.head.php b/adm/admin.head.php
index ba6c81916..50031a2ed 100644
--- a/adm/admin.head.php
+++ b/adm/admin.head.php
@@ -100,21 +100,13 @@ function textarea_size(fld, size)
                 $href2 = '</a>';
             }
             $current_class = "";
-<<<<<<< HEAD
-            if ((isset($sub_menu) && substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2)) || defined('_ADMIN_INDEX_'))
-=======
-            if (isset($sub_menu) && (substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2) || $admin_index))
->>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
+            if (isset($sub_menu) && (substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2)) || $admin_index)
                 $current_class = " gnb_1depth_on";
             echo "<li class=\"gnb_1depth".$current_class."\">";
             echo $href1 . $menu['menu'.$key][0][1] . $href2;
             echo print_menu1('menu'.$key, 1);
             echo "</li>";
-<<<<<<< HEAD
-            if ($current_class || !defined('_ADMIN_INDEX_')) $current_class = ""; // 클래스 반복부여 방지
-=======
             if ($current_class || !$admin_index) $current_class = ""; // 클래스 반복부여 방지
->>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
         }
 
         ?>
diff --git a/tail.sub.php b/tail.sub.php
index 4d5f8d0ee..94b65bcf9 100644
--- a/tail.sub.php
+++ b/tail.sub.php
@@ -9,13 +9,10 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <?
 $tmp_sql = " select count(*) as cnt from {$g4['login_table']} where lo_ip = '{$_SERVER['REMOTE_ADDR']}' ";
 $tmp_row = sql_fetch($tmp_sql);
-<<<<<<< HEAD
+
 //sql_query(" lock table $g4['login_table'] write ", false);
 if ($tmp_row['cnt'])
 {
-=======
-if ($tmp_row['cnt']) {
->>>>>>> 5ed9a4d24d0938dc75a47c8401aa9413da181c80
 	$tmp_sql = " update {$g4['login_table']} set mb_id = '{$member['mb_id']}', lo_datetime = '{$g4['time_ymdhis']}', lo_location = '$lo_location', lo_url = '$lo_url' where lo_ip = '{$_SERVER['REMOTE_ADDR']}' ";
 	sql_query($tmp_sql, FALSE);
 } else {
@@ -24,12 +21,9 @@ if ($tmp_row['cnt']) {
 
 	// 시간이 지난 접속은 삭제한다
 	sql_query(" delete from {$g4['login_table']} where lo_datetime < '".date("Y-m-d H:i:s", $g4['server_time'] - (60 * $config['cf_login_minutes']))."' ");
-<<<<<<< HEAD
 
 	// 부담(overhead)이 있다면 테이블 최적화
 	//$row = sql_fetch(" SHOW TABLE STATUS FROM `$mysql_db` LIKE '$g4['login_table']' ");
 	//if ($row['Data_free'] > 0) sql_query(" OPTIMIZE TABLE $g4['login_table'] ");
-=======
->>>>>>> 5ed9a4d24d0938dc75a47c8401aa9413da181c80
 }
 ?>
\ No newline at end of file