diff --git a/bbs/point.php b/bbs/point.php
index 8b6882fcd..e41d8b7a7 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -105,7 +105,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
         <?=get_paging($config[cf_write_pages], $page, $total_page, $_SERVER[PHP_SELF].'?'.$qstr.'&amp;page=');?>
     </div>
 
-    <div class="btn_window">
+    <div class="btn_win">
         <a href="javascript:window.close();">창닫기</a>
     </div>
 </div>
diff --git a/skin/member/neo/memo_form.skin.php b/skin/member/neo/memo_form.skin.php
index f676ceae3..245d160b3 100644
--- a/skin/member/neo/memo_form.skin.php
+++ b/skin/member/neo/memo_form.skin.php
@@ -35,13 +35,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     </tbody>
     </table>
 
-<<<<<<< HEAD
-    <?=captcha_html();?>
-
-    <div class="btn_window btn_confirm">
-=======
     <div class="btn_win">
->>>>>>> 41f59fa9ae589fc22660fde7d19293f195aede31
         <input type="submit" id="btn_submit" class="btn_submit" value="보내기">
         <a href="javascript:window.close();">창닫기</a>
     </div>