diff --git a/skin/outlogin/neo/outlogin.skin.1.php b/skin/outlogin/neo/outlogin.skin.1.php
index 3216d939c..073d9bf6d 100644
--- a/skin/outlogin/neo/outlogin.skin.1.php
+++ b/skin/outlogin/neo/outlogin.skin.1.php
@@ -34,8 +34,7 @@ else
 <section id="ol_before" class="outlogin">
 <h2>사이트 회원</h2>
 <!-- 로그인 전 외부로그인 시작 -->
-<<<<<<< HEAD
-    <form name="fhead" method="post" onsubmit="return fhead_submit(this);" autocomplete="off">
+    <form name="fhead" method="post" action="<?=$action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">
     <fieldset>
         <legend>로그인</legend>
         <input type="hidden" name="url" value="<?=$outlogin_url?>">
@@ -51,25 +50,8 @@ else
     </fieldset>
     </form>
 </section>
-=======
-<form name="fhead" method="post" action="<?=$action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">
-<fieldset>
-    <legend>로그인</legend>
-    <input type="hidden" name="url" value="<?=$outlogin_url?>">
-    <label for="mb_id">아이디</label>
-    <input type="text" id="mb_id" name="mb_id" maxlength="20" required>
-    <label for="mb_password">패스워드</label>
-    <input type="password" id="mb_password" name="mb_password" maxlength="20">
-    <input type="checkbox" id="auto_login" name="auto_login" value="1" onclick="if (this.checked) { if (confirm('자동로그인을 사용하시면 다음부터 회원아이디와 패스워드를 입력하실 필요가 없습니다.\n\n\공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?')) { this.checked = true; } else { this.checked = false; } }">
-    <label for="auto_login">자동로그인</label>
-    <input type="submit" value="로그인">
-    <a href="javascript:win_password_lost();">아이디/패스워드 찾기</a>
-    <a href="<?=$g4['bbs_path']?>/register.php">회원가입</a>
-</fieldset>
-</form>
->>>>>>> 6040266aed7f782fddaf6f63366be5b06bdfa780
 
-<script type="text/javascript">
+<script>
 function fhead_submit(f)
 {
     return true;