diff --git a/head.sub.php b/head.sub.php
index a3f8393a0..380996e3a 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -1,10 +1,7 @@
 <?php
 // 이 파일은 새로운 파일 생성시 반드시 포함되어야 함
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-<<<<<<< HEAD
-=======
 
->>>>>>> 43c0282f463b6fd895a835ca3e71da6b0844328c
 $begin_time = get_microtime();
 
 if (!isset($g4['title']))
@@ -53,15 +50,9 @@ header("Pragma: no-cache"); // HTTP/1.0
 <title><?=$g4['title']?></title>
 <meta http-equiv='X-UA-Compatible' content='IE=Edge' />
 <? if (isset($administrator)) { ?>
-<<<<<<< HEAD
-<link rel="stylesheet" href="<?=$g4['path']?>/adm.css?=<?=date("md")?>">
-<? } else { ?>
-<link rel="stylesheet" href="<?=$g4['path']?>/def.css?=<?=date("md")?>">
-=======
 <link rel="stylesheet" href="<?=$g4['url']?>/css/adm.css?=<?=date("md")?>">
 <? } else { ?>
 <link rel="stylesheet" href="<?=$g4['url']?>/css/def.css?=<?=date("md")?>">
->>>>>>> 43c0282f463b6fd895a835ca3e71da6b0844328c
 <?}?>
 <!--[if lte IE 8]>
 <script src="<?=$g4['url']?>/js/html5.js"></script>