diff --git a/adm/member_form.php b/adm/member_form.php
index 5a07f5c0c..12b1ab651 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -1,65 +1,87 @@
 <?
 $sub_menu = "200100";
+<<<<<<< HEAD
 include_once('./_common.php');
+=======
+include_once("./_common.php");
+>>>>>>> 2d05a76a0161bcafd2836640f07f6cc165015584
 
-auth_check($auth[$sub_menu], 'w');
+auth_check($auth[$sub_menu], "w");
 
 $token = get_token();
 
-if ($w == '')
+if ($w == "") 
 {
+<<<<<<< HEAD
     $required_mb_id = 'required minlength="3" alphanumericunderline id="회원아이디" name="회원아이디"';
     $required_mb_password = 'required id="패스워드" name="패스워드"';
+=======
+    $required_mb_id = "required minlength=3 alphanumericunderline itemname='회원아이디'";
+    $required_mb_password = "required itemname='패스워드'";
+>>>>>>> 2d05a76a0161bcafd2836640f07f6cc165015584
 
     $mb[mb_mailling] = 1;
     $mb[mb_open] = 1;
     $mb[mb_level] = $config[cf_register_level];
-    $html_title = '등록';
+    $html_title = "등록";
 }
-else if ($w == 'u')
+else if ($w == "u") 
 {
     $mb = get_member($mb_id);
+<<<<<<< HEAD
     if (!$mb['mb_id'])
         alert('존재하지 않는 회원자료입니다.'); 
+=======
+    if (!$mb[mb_id])
+        alert("존재하지 않는 회원자료입니다."); 
+>>>>>>> 2d05a76a0161bcafd2836640f07f6cc165015584
 
     if ($is_admin != 'super' && $mb[mb_level] >= $member[mb_level])
-        alert('자신보다 권한이 높거나 같은 회원은 수정할 수 없습니다.');
+        alert("자신보다 권한이 높거나 같은 회원은 수정할 수 없습니다.");
 
-    $required_mb_id = 'readonly';
-    $required_mb_password = '';
-    $html_title = '수정';
+    $required_mb_id = "readonly style='background-color:#dddddd;'";
+    $required_mb_password = "";
+    $html_title = "수정";
 
-    $mb['mb_email'] = get_text($mb['mb_email']);
-    $mb['mb_homepage'] = get_text($mb['mb_homepage']);
-    $mb['mb_password_q'] = get_text($mb['mb_password_q']);
-    $mb['mb_password_a'] = get_text($mb['mb_password_a']);
-    $mb['mb_birth'] = get_text($mb['mb_birth']);
-    $mb['mb_tel'] = get_text($mb['mb_tel']);
-    $mb['mb_hp'] = get_text($mb['mb_hp']);
-    $mb['mb_addr1'] = get_text($mb['mb_addr1']);
-    $mb['mb_addr2'] = get_text($mb['mb_addr2']);
-    $mb['mb_signature'] = get_text($mb['mb_signature']);
-    $mb['mb_recommend'] = get_text($mb['mb_recommend']);
-    $mb['mb_profile'] = get_text($mb['mb_profile']);
-    $mb['mb_1'] = get_text($mb['mb_1']);
-    $mb['mb_2'] = get_text($mb['mb_2']);
-    $mb['mb_3'] = get_text($mb['mb_3']);
-    $mb['mb_4'] = get_text($mb['mb_4']);
-    $mb['mb_5'] = get_text($mb['mb_5']);
-    $mb['mb_6'] = get_text($mb['mb_6']);
-    $mb['mb_7'] = get_text($mb['mb_7']);
-    $mb['mb_8'] = get_text($mb['mb_8']);
-    $mb['mb_9'] = get_text($mb['mb_9']);
-    $mb['mb_10'] = get_text($mb['mb_10']);
-}
-else
-    alert('제대로 된 값이 넘어오지 않았습니다.');
+    $mb[mb_email]       = get_text($mb[mb_email]);
+    $mb[mb_homepage]    = get_text($mb[mb_homepage]);
+    $mb[mb_password_q]  = get_text($mb[mb_password_q]);
+    $mb[mb_password_a]  = get_text($mb[mb_password_a]);
+    $mb[mb_birth]       = get_text($mb[mb_birth]);
+    $mb[mb_tel]         = get_text($mb[mb_tel]);
+    $mb[mb_hp]          = get_text($mb[mb_hp]);
+    $mb[mb_addr1]       = get_text($mb[mb_addr1]);
+    $mb[mb_addr2]       = get_text($mb[mb_addr2]);
+    $mb[mb_signature]   = get_text($mb[mb_signature]);
+    $mb[mb_recommend]   = get_text($mb[mb_recommend]);
+    $mb[mb_profile]     = get_text($mb[mb_profile]);
+    $mb[mb_1]           = get_text($mb[mb_1]);
+    $mb[mb_2]           = get_text($mb[mb_2]);
+    $mb[mb_3]           = get_text($mb[mb_3]);
+    $mb[mb_4]           = get_text($mb[mb_4]);
+    $mb[mb_5]           = get_text($mb[mb_5]);
+    $mb[mb_6]           = get_text($mb[mb_6]);
+    $mb[mb_7]           = get_text($mb[mb_7]);
+    $mb[mb_8]           = get_text($mb[mb_8]);
+    $mb[mb_9]           = get_text($mb[mb_9]);
+    $mb[mb_10]          = get_text($mb[mb_10]);
+} 
+else 
+    alert("제대로 된 값이 넘어오지 않았습니다.");
 
+<<<<<<< HEAD
 if ($mb[mb_mailling]) $mailling_checked = 'checked'; // 메일 수신
 if ($mb[mb_sms]) $sms_checked = 'checked'; // SMS 수신
 if ($mb[mb_open]) $open_checked = 'checked'; // 정보 공개
 
 $g4['title'] = '회원정보 ' . $html_title;
+=======
+if ($mb[mb_mailling]) $mailling_checked = "checked"; // 메일 수신
+if ($mb[mb_sms])      $sms_checked = "checked"; // SMS 수신
+if ($mb[mb_open])     $open_checked = "checked"; // 정보 공개
+
+$g4[title] = "회원정보 " . $html_title;
+>>>>>>> 2d05a76a0161bcafd2836640f07f6cc165015584
 include_once("./admin.head.php");
 ?>
 
diff --git a/index.php b/index.php
index a0f99242b..ad68d3695 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,9 @@ include_once("./_head.php");
 ?>
 
 강좌홈페이지 작업 중입니다.<br>
-현재 HTML5 로 선언되어 있습니다.
+현재 HTML5 로 선언되어 있습니다.<br>
+chicpro 님도 참가합니다.<br>
+반갑습니다.
 
 <?
 include_once("./_tail.php");