diff --git a/adm/admin.head.php b/adm/admin.head.php
index 33eea49c6..2cd2d23cf 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) || defined('_ADMIN_INDEX_')))
->>>>>>> e7b5429b4b7a43150b180dc9efa62eaf13e8b6f7
                 $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 = ""; // 클래스 반복부여 방지
->>>>>>> e7b5429b4b7a43150b180dc9efa62eaf13e8b6f7
         }
 
         ?>
diff --git a/adm/auth_list.php b/adm/auth_list.php
index 77e7f3444..462ee10ae 100644
--- a/adm/auth_list.php
+++ b/adm/auth_list.php
@@ -10,7 +10,7 @@ $token = get_token();
 $sql_common = " from {$g4['auth_table']} a left join {$g4['member_table']} b on (a.mb_id=b.mb_id) ";
 
 $sql_search = " where (1) ";
-if (isset($stx)) {
+if ($stx) {
     $sql_search .= " and ( ";
     switch ($sfl) {
         default :
diff --git a/adm/index.php b/adm/index.php
index 05e20e0f9..b41fe96bc 100644
--- a/adm/index.php
+++ b/adm/index.php
@@ -16,7 +16,7 @@ $sql_search = " where (1) ";
 if ($is_admin != 'super')
     $sql_search .= " and mb_level <= '{$member['mb_level']}' ";
 
-if (!isset($sst)) {
+if (!$sst) {
     $sst = "mb_datetime";
     $sod = "desc";
 }
diff --git a/adm/member_list.php b/adm/member_list.php
index 22fe44179..a6cbd89df 100644
--- a/adm/member_list.php
+++ b/adm/member_list.php
@@ -70,7 +70,7 @@ $row = sql_fetch($sql);
 $intercept_count = $row['cnt'];
 
 $listall = "";
-if (isset($sfl) || isset(isset($stx))) // 검색일 때만 처음 버튼을 보여줌
+if (isset($sfl) || isset($stx)) // 검색일 때만 처음 버튼을 보여줌
     $listall = '<a href="'.$_SERVER['PHP_SELF'].'">전체목록</a>';
 
 $g4['title'] = '회원관리';
@@ -116,7 +116,7 @@ var list_delete_php = 'member_list_delete.php';
         <option value="mb_recommend">추천인</option>
     </select>
     <label for="stx">검색어</label>
-    <input type="text" id="stx" name="stx" required value="<?=isset(isset($stx))?>">
+    <input type="text" id="stx" name="stx" required value="<?=isset($stx)?>">
     <input type="submit" class="fieldset_submit" value="검색">
 </fieldset>
 </form>
diff --git a/head.php b/head.php
index d5c78d929..65d8b552a 100644
--- a/head.php
+++ b/head.php
@@ -39,11 +39,7 @@ include_once($g4['path'].'/lib/popular.lib.php');
         <input type="submit" value="검색">
     </fieldset>
     </form>
-<<<<<<< HEAD
     <h1><?=$config['cf_title']?></h1>
-=======
-    <? if (!isset($bo_table)) {?><h1><?=$g4['title']?></h1><? } ?>
->>>>>>> e7b5429b4b7a43150b180dc9efa62eaf13e8b6f7
 </header>
 
 <div>
diff --git a/test.php b/test.php
index 45b43c3e6..9ec5350cf 100644
--- a/test.php
+++ b/test.php
@@ -1,5 +1,37 @@
 <?
 $str = "xx";
 $len = 2;
-echo ord($str{$len});
-?>
\ No newline at end of file
+//echo ord($str{$len});
+?>
+
+<!doctype html>
+<html lang="ko">
+<head>
+<title>테스트</title>
+<meta charset="utf-8">
+<style>
+input {
+border-radius:7px;  /*모서리 깍이는 정도*/
+border:1px solid #dedede;  /*선두께, 스타일(점선), 컬러*/
+background-color:#f7f7f7;  /*배경 컬러*/
+padding:5px;
+box-shadow:0 0 10px silver;
+}
+input:focus {
+border-radius:7px;  /*모서리 깍이는 정도*/
+border:1px solid #ff3061;  /*선두께, 스타일(점선), 컬러*/
+background-color:#f7f7f7;  /*배경 컬러*/
+padding:5px;
+box-shadow:0 0 10px #ff3061;
+outline:0;
+}
+</style>
+</head>
+<body>
+
+<input type="text">
+
+<input type="checkbox">
+
+</body>
+</html>
\ No newline at end of file