diff --git a/lib/common.lib.php b/lib/common.lib.php
index 84bf7196d..cb3dff323 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -997,9 +997,17 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
 
                 if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
                     $tmp_name = $tmp_name.' '.$name;
+<<<<<<< HEAD
             }
         } else {
             $tmp_name = $tmp_name.' '.$name;
+=======
+            } else { 
+                $tmp_name = $tmp_name.' '.$name; 
+            } 
+        } else { 
+            $tmp_name = $tmp_name.' '.$name; 
+>>>>>>> a51735e00ddf29bead8ea199ffa91d1234792320
         }
         $tmp_name .= '</a>';
 
@@ -1008,7 +1016,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
         if(!$bo_table)
             return $name;
 
-        $tmp_name = "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=wr_name,1&amp;stx=".$name."\" title=\"$name 이름으로 검색\" class=\"sv_guest\" onclick=\"return false;\">$name</a>";
+        $tmp_name = '<a href="'.G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;sca='.$sca.'&amp;sfl=wr_name,1&amp;stx='.$name.'" title="'.$name.' 이름으로 검색" class="sv_guest" onclick="return false;">'.$name.'</a>';
         $title_mb_id = '[비회원]';
     }