diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 197a57c4..17eade59 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -842,13 +842,8 @@ if (!empty($setting_website_nav)) {
 
             </div>
           </div>
-<<<<<<< HEAD
           <?php if ($information->ic_sitecode == 'chinatravel' || $information->ic_sitecode == 'shanghai' || $information->ic_sitecode == 'beijing') {
             ?>
-=======
-          <?php if ($information->ic_sitecode == 'chinatravel' || $information->ic_sitecode == 'shanghai') {
-    ?>
->>>>>>> f657130093af1eb0b39ff40bd09352823b9de5dc
             <div>
               <div class="col-sm-8">
                 <label>附加图片PC
@@ -2507,11 +2502,7 @@ foreach ($author_list as $author_item) {
             <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
           </label>
           <div class="clearfix"></div>
-<<<<<<< HEAD
           <?php if (in_array($this->config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai','beijing'))) { ?>
-=======
-          <?php if (in_array($this->config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai'))) {?>
->>>>>>> f657130093af1eb0b39ff40bd09352823b9de5dc
             <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
               <input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox"
                 onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新