diff --git a/windows/configuration/guidelines-for-assigned-access-app.md b/windows/configuration/guidelines-for-assigned-access-app.md
index 91b729e5c8..9e2edfd8e0 100644
--- a/windows/configuration/guidelines-for-assigned-access-app.md
+++ b/windows/configuration/guidelines-for-assigned-access-app.md
@@ -110,11 +110,7 @@ Entry |	Result
 `contoso.com`	| Blocks all requests to contoso.com, www.contoso.com, and sub.www.contoso.com
 `https://*` | Blocks all HTTPS requests to any domain.
 `mail.contoso.com` |	Blocks requests to mail.contoso.com but not to www.contoso.com or contoso.com
-<<<<<<< HEAD
 `.contoso.com` |	Blocks contoso.com but not its subdomains, like subdomain.contoso.com.
-=======
-`.contoso.com` |	Blocks contoso.com but not its subdomains, like contoso.com/docs.
->>>>>>> refs/remotes/origin/master
 `.www.contoso.com` |	Blocks www.contoso.com but not its subdomains.
 `*`	| Blocks all requests except for URLs in the Blocked URL Exceptions list. 
 `*:8080`	| Blocks all requests to port 8080.