diff --git a/module/mr/control.php b/module/mr/control.php
index 7146e75753..49dc131b63 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -3,13 +3,9 @@ class mr extends control
 {
     public function browse($objectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-<<<<<<< HEAD
         $this->loadModel('mr');
 
         $mrList = $this->mr->getList(0, $orderBy);
-=======
-        $mrList = $this->mr->getList($orderBy);
->>>>>>> 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd
 
         /* Pager. */
         $this->app->loadClass('pager', $static = true);
@@ -25,11 +21,6 @@ class mr extends control
         $this->view->objectID = $objectID;
         $this->view->pager    = $pager;
         $this->view->mrList = empty($mrList) ? $mrList: $mrList[$pageID - 1];;
-<<<<<<< HEAD
-=======
-        $this->view->products = $this->loadModel('product')->getPairs();
->>>>>>> 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd
-
         $this->display();
     }
 
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 6c61e31098..24251ffcab 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -7,7 +7,6 @@ $lang->mr->edit   = "编辑{$lang->mr->common}";
 $lang->mr->delete = "删除{$lang->mr->common}";
 $lang->mr->detail = "详情";
 
-<<<<<<< HEAD
 $lang->mr->addGitlab = "添加GitLab项目";
 
 $lang->mr->id          = 'ID';
@@ -22,18 +21,6 @@ $lang->mr->link        = 'GitLab链接';
 $lang->mr->pipeline    = '流水线';
 $lang->mr->auditStatus = '审核状态';
 $lang->mr->lastExec    = '执行状态';
-=======
-$lang->mr->id       = 'ID';
-$lang->mr->iid      = "{$lang->mr->common}ID";
-$lang->mr->name     = "{$lang->mr->common}名称";
-$lang->mr->title    = $lang->mr->name;
-$lang->mr->status   = '状态';
-$lang->mr->author   = '创建人';
-$lang->mr->assignee = '指派给';
-$lang->mr->reviewer = '评审人';
-$lang->mr->link     = 'GitLab链接';
-$lang->mr->project  = 'GitLab项目';
->>>>>>> 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd
 
 $lang->mr->sourceProject = '源项目';
 $lang->mr->sourceBranch  = '源分支';
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index feb9d59e92..55f67c6bd8 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -1,11 +1,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class='pull-right'>
-<<<<<<< HEAD
     <?php if(common::hasPriv('mr', 'create')) echo html::a(helper::createLink('mr', 'create'), "<i class='icon icon-plus'></i> " . $lang->mr->addGitlab, '', "class='btn btn-primary'");?>
-=======
-    <?php if(common::hasPriv('mr', 'create')) echo html::a(helper::createLink('mr', 'create'), "<i class='icon icon-plus'></i> " . $lang->mr->create, '', "class='btn btn-primary'");?>
->>>>>>> 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd
   </div>
 </div>
 <div id='mainContent'>
@@ -25,16 +21,12 @@
         <tr>
           <?php $vars = "objectID=$objectID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
           <th class='w-60px  text-left'><?php common::printOrderLink('id', $orderBy, $vars, $lang->mr->id); ?></th>
-<<<<<<< HEAD
           <th class='w-100px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->mr->name); ?></th>
           <th class='w-100px text-left'><?php common::printOrderLink('sourceBranch', $orderBy, $vars, $lang->mr->sourceBranch); ?></th>
           <th class='w-100px text-left'><?php common::printOrderLink('targetBranch', $orderBy, $vars, $lang->mr->targetBranch); ?></th>
           <th class='w-100px text-left'><?php common::printOrderLink('pipeline', $orderBy, $vars, $lang->mr->pipeline); ?></th>
           <th class='w-100px text-left'><?php common::printOrderLink('auditStatus', $orderBy, $vars, $lang->mr->auditStatus); ?></th>
           <th class='w-100px text-left'><?php common::printOrderLink('lastExec', $orderBy, $vars, $lang->mr->lastExec); ?></th>
-=======
-          <th class='w-200px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->mr->project); ?></th>
->>>>>>> 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd
           <th class='w-100px c-actions-4'><?php echo $lang->actions; ?></th>
         </tr>
       </thead>
@@ -42,7 +34,6 @@
         <?php foreach($mrList as $mr):?>
         <tr>
           <td class='text'><?php echo $mr->id; ?></td>
-<<<<<<< HEAD
           <td class='text'><?php echo $mr->name; ?></td>
           <td class='text'><?php echo $mr->target_branch; ?></td>
           <td class='text'><?php echo $mr->source_branch; ?></td>
@@ -56,16 +47,6 @@
             common::printLink('mr', 'edit', "mrID=$mr->id&objectID=$objectID", '<i class="icon icon-edit"></i>', '', "title='{$lang->mr->edit}' class='btn btn-info'");
             if(common::hasPriv('mr', 'delete')) echo html::a($this->createLink('mr', 'delete', "mrID=$mr->id&objectID=$objectID"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn'");
             ?>
-=======
-          <td class='text' title='<?php echo $mr->projectID; ?>'><?php echo html::a($this->createLink('mr', 'browse', "mrID={$mr->id}&branchID=&objectID=$objectID"), $mr->projectID);?></td>
-          <td class='text-left c-actions'>
-          <?php
-          common::printLink('mr', 'list', "mr={$mr->id}", '<i class="icon icon-review"></i>', '', "title='{$lang->mr->list}' class='btn btn-info'");
-          common::printLink('mr', 'create', "mr={$mr->id}", '<i class="icon icon-plus"></i>', '', "title='{$lang->mr->create}' class='btn btn-info'");
-          common::printLink('mr', 'edit', "mrID=$mr->id&objectID=$objectID", '<i class="icon icon-edit"></i>', '', "title='{$lang->mr->edit}' class='btn btn-info'");
-          if(common::hasPriv('mr', 'delete')) echo html::a($this->createLink('mr', 'delete', "mrID=$mr->id&objectID=$objectID"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn'");
-          ?>
->>>>>>> 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd
           </td>
         </tr>
         <?php endforeach;?>