diff --git a/share/apps.json b/share/apps.json
index ed6c9d283..903d1c39e 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -1060,8 +1060,13 @@
 		"Google AdSense": {
 			"website": "google.com/adsense",
 			"cats": [ 36 ],
+<<<<<<< HEAD
 			"env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ],
 			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ]
+=======
+			"env": [ "^google_ad_" ],
+			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick.net" ]
+>>>>>>> 96d095b... Escaped dots in AlloyUI and Google Adsense regular expressions.
 		},
 		"Google App Engine": {
 			"website": "code.google.com/appengine",