diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 19c1d9fd295..585251da272 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1855,6 +1855,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
         } else if (zone.getNetworkType() == NetworkType.Advanced) {
             if (zone.isSecurityGroupEnabled()) {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             	if (ipv6) {
             		throw new InvalidParameterValueException("IPv6 is not supported with security group!");
@@ -1872,6 +1873,10 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
 =======
                 // Only Account specific Isolated network with sourceNat service disabled are allowed in security group
                 // enabled zone
+=======
+                // Only Account specific Isolated network with sourceNat service disabled are allowed in security group
+                // enabled zone
+>>>>>>> parent of d7201df... CLOUDSTACK-737
 =======
                 // Only Account specific Isolated network with sourceNat service disabled are allowed in security group
                 // enabled zone
@@ -1882,6 +1887,9 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
                     throw new InvalidParameterValueException("Only Account specific Isolated network with sourceNat " +
                             "service disabled are allowed in security group enabled zone");
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> parent of d7201df... CLOUDSTACK-737
+=======
 >>>>>>> parent of d7201df... CLOUDSTACK-737
 =======
 >>>>>>> parent of d7201df... CLOUDSTACK-737
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index bd4f338bdc5..43967e286a3 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -429,6 +429,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 =======
             s_logger.error("Unable to resolve " + cmd.getHypervisor() + " to a valid supported hypervisor type");
             throw new InvalidParameterValueException("Unable to resolve " + cmd.getHypervisor() + " to a supported ");
+<<<<<<< HEAD
+>>>>>>> parent of d7201df... CLOUDSTACK-737
+=======
 >>>>>>> parent of d7201df... CLOUDSTACK-737
         }