diff --git a/ui/index.jsp b/ui/index.jsp
index 7b28a1e3524..94a930883b7 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -741,8 +741,13 @@
             </ul>
 
             <div class="info-desc" id="add_zone_guest_traffic_desc">
+<<<<<<< HEAD
              
 >>>>>>> 2f682ea... cloudstack 3.0 new UI - add zone wizard - localize text in html code.
+=======
+              <span id="for_basic_zone" style="display:none"><fmt:message key="message.guest.traffic.in.basic.zone"/></span>
+							<span id="for_advanced_zone" style="display:none"><fmt:message key="message.guest.traffic.in.advanced.zone"/></span>
+>>>>>>> f0e3cad... cloudstack 3.0 new UI - add zone wizard - guest traffic - show different description for basic zone and advanced zone.
             </div>
             <div class="content input-area">
               <div class="select-container"></div>
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 1be001ab0e6..39c93d0e35f 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -790,6 +790,7 @@
 
       guestTraffic: {
         preFilter: function(args) {				                 		
+<<<<<<< HEAD
           var $guestTrafficDesc = $('.zone-wizard:visible').find('#add_zone_guest_traffic_desc');	 		     
 					if (args.data['network-model'] == 'Basic') {
 						$guestTrafficDesc.find('#for_basic_zone').css('display', 'inline');
@@ -799,6 +800,18 @@
 						$guestTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
 						$guestTrafficDesc.find('#for_basic_zone').hide();
 					}		
+=======
+          var $guestTrafficDesc = $("#add_zone_guest_traffic_desc");	      
+          //debugger;					
+          if (args.data['network-model'] == 'Basic') {
+            $guestTrafficDesc.find("#for_basic_zone").css('display', 'inline');
+						$guestTrafficDesc.find("#for_advanced_zone").hide();
+          }
+          else { //args.data['network-model'] == 'Advanced'
+            $guestTrafficDesc.find("#for_advanced_zone").css('display', 'inline');
+						$guestTrafficDesc.find("#for_basic_zone").hide();
+          }		
+>>>>>>> f0e3cad... cloudstack 3.0 new UI - add zone wizard - guest traffic - show different description for basic zone and advanced zone.
 				
           var selectedZoneObj = {
             networktype: args.data['network-model']