diff --git a/adm/shop_admin/couponform.php b/adm/shop_admin/couponform.php
index 18792d24d..34866487e 100644
--- a/adm/shop_admin/couponform.php
+++ b/adm/shop_admin/couponform.php
@@ -162,7 +162,7 @@ $(function() {
         change_type(cp_type);
     });
 
-    /** select 변경때 반영하려면 주서 제거
+    /** select 변경때 반영하려면 주석 제거
     $("#cp_method").change(function() {
         var cp_method = $(this).val();
         change_method(cp_method);
@@ -176,7 +176,7 @@ $(function() {
 
     $("#sch_target").click(function() {
         var cp_method = $("#cp_method").val();
-        var opt = "left=50,top=50,width=500,height=600";
+        var opt = "left=50,top=50,width=520,height=600,scrollbars=1";
         var url = "./coupontarget.php?sch_target=";
 
         if(cp_method == "0") {
@@ -194,7 +194,7 @@ $(function() {
             return false;
         }
 
-        var opt = "left=50,top=50,width=500,height=600";
+        var opt = "left=50,top=50,width=520,height=600,scrollbars=1";
         var url = "./couponmember.php";
         window.open(url, "win_member", opt);
     });
diff --git a/adm/shop_admin/itemqalist.php b/adm/shop_admin/itemqalist.php
index 8c3bcc681..7eb12e09a 100644
--- a/adm/shop_admin/itemqalist.php
+++ b/adm/shop_admin/itemqalist.php
@@ -174,7 +174,6 @@ if ($sfl || $stx) // 검색 결과일 때만 처음 버튼을 보여줌
     </table>
 
     <div class="btn_list">
-        <input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value">
         <input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value">
     </div>
     </form>
diff --git a/adm/shop_admin/itemqalistupdate.php b/adm/shop_admin/itemqalistupdate.php
index b81d07653..52a338b8e 100644
--- a/adm/shop_admin/itemqalistupdate.php
+++ b/adm/shop_admin/itemqalistupdate.php
@@ -8,21 +8,7 @@ if (!count($_POST['chk'])) {
     alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
 }
 
-if ($_POST['act_button'] == "선택수정") {
-
-    auth_check($auth[$sub_menu], 'w');
-
-    for ($i=0; $i<count($_POST['chk']); $i++) {
-
-        // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-
-        $sql = "update {$g4['shop_item_qa_table']}
-                   set iq_confirm = '{$_POST['iq_confirm'][$k]}'
-                 where iq_id      = '{$_POST['iq_id'][$k]}' ";
-        sql_query($sql);
-    }
-} else if ($_POST['act_button'] == "선택삭제") {
+if ($_POST['act_button'] == "선택삭제") {
 
     auth_check($auth[$sub_menu], 'd');
 
diff --git a/shop/orderform.php b/shop/orderform.php
index 012d74323..f06b96997 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -908,6 +908,13 @@ function get_intall_file()
         새로고침(F5) 한후에도 계속 설치파일이 다운로드 되거나 결제가 되지 않으면 브라우저를 새로 열어서 주문해 주시기 바랍니다.<br>
         브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.
     </p>
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+>>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
+=======
+>>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
     <div id="display_pay_button" class="btn_confirm" style="display:none">
         <input type="submit" value="주문하기" class="btn_submit">
         <a href="javascript:history.go(-1);" class="btn01">취소</a>
@@ -1579,4 +1586,8 @@ include_once('./_tail.php');
 
 <script>
 CheckPayplusInstall();
-</script>
\ No newline at end of file
+<<<<<<< HEAD
+</script>
+=======
+</script>
+>>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f