diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 3e96b78ef4c..11e9a5c4a6f 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -2551,6 +2551,9 @@ resource.state=Resource state
 >>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
 =======
 LUN.number=LUN #
+confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
+
+
 
 
 >>>>>>> 50fadb4... cloudstack 3.0 new UI - system page - localize primary storage section.
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 3cbc42c6b95..32b71e492ef 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -1693,7 +1693,6 @@ resource.state=リソースの状態
 >>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
 =======
 LUN.number=LUN #
-
-
+confirm.remove.IP.range=あなたがこのIPアドレス範囲の削除を希望することを確認してください。
 
 >>>>>>> 50fadb4... cloudstack 3.0 new UI - system page - localize primary storage section.
diff --git a/ui/index.jsp b/ui/index.jsp
index 5bf4fb9b3db..e65c2e465ef 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2976,7 +2976,12 @@ dictionary = {
 >>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
 =======
 'resource.state': '<fmt:message key="resource.state" />',
+<<<<<<< HEAD
 'LUN.number': '<fmt:message key="LUN.number" />'
 >>>>>>> 50fadb4... cloudstack 3.0 new UI - system page - localize primary storage section.
+=======
+'LUN.number': '<fmt:message key="LUN.number" />',
+'confirm.remove.IP.range': '<fmt:message key="confirm.remove.IP.range" />'
+>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
 };
 </script>
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index feabdd78f55..ccddb197b1c 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8273,9 +8273,13 @@
       guestIpRanges: {
 =======
       guestIpRanges: { //Advanced zone - Guest traffic type - Network tab - Network detailView - View IP Ranges 
+<<<<<<< HEAD
 >>>>>>> 250b296... cloudstack 3.0 new UI - system page - Advanced zone - Guest traffic type - Network tab - Network detailView - View IP Ranges - remove obsolete code for Basic zone since this section is only available for Advanced zone now.
         title: 'label.guest.ip.range', //Jes
 >>>>>>> 6ee8ecf... cloudstack 3.0 new UI - system page - localize secondary storage section.
+=======
+        title: 'label.guest.ip.range', 
+>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
         id: 'guestIpRanges',
         listView: {
           section: 'guest-IP-range',
@@ -8390,6 +8394,7 @@
               }
             },
 
+<<<<<<< HEAD
             'remove': {
               label: 'label.remove.ip.range' ,
               messages: {
@@ -8398,6 +8403,16 @@
                 },
                 notification: function(args) {
                   return 'label.remove.ip.range';
+=======
+            'delete': {
+              label: 'remove.IP.range' , 
+              messages: {
+                confirm: function(args) {
+                  return 'confirm.remove.IP.range';
+                },                
+                notification: function(args) {
+                  return 'remove.IP.range';
+>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
                 }
               },
               action: function(args) {
@@ -8422,8 +8437,13 @@
       }
     }
   };
+<<<<<<< HEAD
 
   function addExternalLoadBalancer(args, physicalNetworkObj, apiCmd, apiCmdRes, apiCmdObj) {
+=======
+  
+  function addExternalLoadBalancer(args, physicalNetworkObj, apiCmd, apiCmdRes, apiCmdObj) { 
+>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
     var array1 = [];
     array1.push("&physicalnetworkid=" + physicalNetworkObj.id);
     array1.push("&username=" + todb(args.data.username));