diff --git a/themes/vr/portal/portal.html b/themes/vr/portal/portal.html
index 093f8f6..82832ef 100755
--- a/themes/vr/portal/portal.html
+++ b/themes/vr/portal/portal.html
@@ -75,9 +75,9 @@
 <em>Hot Store</em>
 <h2>熱門店家推薦</h2>
 </div>
-<ul class="row">
+<ul>
 <!--{foreach from=$ad2_list item=ad2s name=ad2s}-->
-<li class="col-6">
+<li>
 <div class="item clearfix">
 <div class="Img">
 <h3>{$ad2s.cname}<em>View More</em></h3>
@@ -86,17 +86,8 @@
 <p class="information">
 {$ad2s.address}<br>
 服務專線：{$ad2s.tel}</p>
-<<<<<<< HEAD
-	<div class="hidden-xs">
-		<a class="weblink" target="_blank" href="{$http}{$ad2s.domain}" title="官方網站">官方網站<em>WEB</em></a>
-		<a class="bookinglink" target="_blank" href="{$ad2s.vrmap}" title="地理位置">地理位置<em>VIEW</em></a>
-	</div>
-=======
-
 <a class="weblink" target="_blank" href="{$http}{$ad2s.domain}" title="官方網站">官方網站<em>WEB</em></a>
 <a class="bookinglink" target="_blank" href="{$ad2s.vrmap}" title="地理位置">地理位置<em>VIEW</em></a>
-
->>>>>>> 8ad3eb3 (reset)
 </div>
 </div>  
 </div>