diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index f316999d4ea..a95ef1a05fd 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -579,10 +579,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
     @Override
     public boolean revokeNetworkACLItem(long ruleId) {
         NetworkACLItemVO aclItem = _networkACLItemDao.findById(ruleId);
-<<<<<<< HEAD
-        if (aclItem != null) {
-            if ((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)) {
-=======
         if(aclItem != null){
             NetworkACL acl = _networkAclMgr.getNetworkACL(aclItem.getAclId());
 
@@ -593,7 +589,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
             _accountMgr.checkAccess(caller, null, true, vpc);
 
             if((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)){
->>>>>>> e2805b8... CLOUDSTACK-5145 : Added permission checks while deleting network ACLs
                 throw new InvalidParameterValueException("ACL Items in default ACL cannot be deleted");
             }
         }