diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 04903df..ac19746 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -158,11 +158,7 @@ define('AUTH_ADAPTERS', [
 ]);
 //등급 관련
 define('ROLES', [
-<<<<<<< HEAD
   'guest' => '비회원', 'user' => '일반회원', 'vip' => 'VIP회원',
-=======
-  'user' => '일반회원', 'vip' => 'VIP회원',
->>>>>>> e0f7632966d765518a4f99c56c4a05c032ec5946
   'bronze' => '일반판매자', 'silver' => '고급판매자', 'gold' => '파워리셀러',
   'manager' => '관리자',  'cloudflare' => "Cloudflare관리자", 'director' => '감독자', 'master' => "마스터",
 ]);
diff --git a/app/Database/board.sql b/app/Database/board.sql
index 668b431..531dced 100644
--- a/app/Database/board.sql
+++ b/app/Database/board.sql
@@ -29,11 +29,7 @@ CREATE TABLE tw_board (
     grpno int(5) UNSIGNED NOT NULL DEFAULT 1 COMMENT 'Group번호: 상위가없을시 기본 uid와 같음',
     grporder int(5) UNSIGNED NOT NULL DEFAULT 1 COMMENT 'Group순서: 상위가없을시 0부터시작',
     grpdepth int(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT 'Group깊이: 상위가없을시 1부터시작 , 상위 grpdpt+1씩 추가필요',
-<<<<<<< HEAD
 	board_category_uid varchar(36) NOT NULL COMMENT '게시판구분',
-=======
-	board_category varchar(10) NOT NULL COMMENT '게시판구분',
->>>>>>> e0f7632966d765518a4f99c56c4a05c032ec5946
     user_uid varchar(36) NULL COMMENT '작성자 정보',
     title varchar(255) NOT NULL COMMENT '제목',
     content text NOT NULL COMMENT '내용',
diff --git a/app/Models/BoardModel.php b/app/Models/BoardModel.php
index 4c09b3b..a800997 100644
--- a/app/Models/BoardModel.php
+++ b/app/Models/BoardModel.php
@@ -11,21 +11,12 @@ class BoardModel extends BaseModel
     // protected $useAutoIncrement = true;
     protected $allowedFields    = ['grpno', 'grporder', 'grpdepth', 'board_category',  'user_uid', 'title', 'content', 'passwd', 'view_cnt', 'status', 'updated_at'];
     protected $validationRules      = [
-<<<<<<< HEAD
         'grpno'               => 'if_exist|numeric',
         'grporder'            => 'if_exist|numeric',
         'grpdepth'            => 'if_exist|numeric',
         'board_category'      => 'required|string',
         'user_uid'            => 'if_exist|regex_match[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/]',
         'title'               => 'required|string',
-=======
-        'grpno'                => 'if_exist|numeric',
-        'grporder'            => 'if_exist|numeric',
-        'grpdepth'              => 'if_exist|numeric',
-        'board_category'             => 'required|string',
-        'user_uid'             => 'if_exist|regex_match[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/]',
-        'title'             => 'required|string',
->>>>>>> e0f7632966d765518a4f99c56c4a05c032ec5946
         'content'             => 'required|string',
         'passwd'              => 'if_exist|trim|string',
         'view_cnt'            => 'if_exist|numeric',