Update FQDN filtering doc and resolve merge conflicts

Author: sujamiya

articles/firewall/domain-filtering-overview.md

@@ -67,10 +67,6 @@ Application rules are designed for filtering HTTP/S and MSSQL traffic. They rely
 
 By understanding the differences between these rule types, you can effectively configure Azure Firewall to meet your organization's security and traffic management needs.
 
-<<<<<<< HEAD:articles/firewall/fqdn-filtering-overview.md
 ## Next steps
 
 - Learn how  Azure Firewall policy rule sets are structured [Azure Firewall Policy rule sets](policy-rule-sets.md).
-=======
-- Learn how  Azure Firewall policy rule sets are structured [Azure Firewall Policy rule sets](policy-rule-sets.md).
->>>>>>> c9cb2e7364bb29ba317a85c404bddcb8cefdb8ec:articles/firewall/domain-filtering-overview.md