--- a/exceptionrules.txt.resolve
+++ b/exceptionrules.txt.resolve
@@ -4604,41 +4604,40 @@ moda4u.com.ua#@#.ya-partner
 @@||g.doubleclick.net/pagead/ads?*^h=600^*^w=300^$subdocument,domain=mijnkapitaal.be
 @@||g.doubleclick.net/gampad/ads?*&callback=googletag.impl.pubads.setAdContentsBySlotForSync&$script,domain=mijnkapitaal.be
 mijnkapitaal.be#@#div[id^="div-gpt-ad"]
 
 ! Bing.com ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=22602)
 @@||www.bing.com/search^$elemhide
 ||bing.com/fd/ls/l?BF=MSJ1&$domain=bing.com
 @@||bing.com/fd/ls/l?BF=MSJ0&$domain=bing.com
-
 @@||huffingtonpost.com/search/$elemhide
 @@||techcrunch.com/search/$elemhide
-@@||www.mapquest.ca^$elemhide
-@@||www.mapquest.com/search/$elemhide
+@@||mapquest.ca^$elemhide
+@@||mapquest.com^$elemhide
 @@||autoblog.com^*^q=$elemhide
 @@||intoautos.com^$elemhide
 @@||when.com^$elemhide
 @@||o2suche.aol.de^$elemhide
 @@||aolsearch.com^$elemhide
 @@||wow.com^$elemhide
 @@||search.aol.co.uk^$elemhide
 @@||search.aol.ca^$elemhide
 @@||recherche.aol.fr^$elemhide
 @@||suche.aol.de^$elemhide
 @@||search.aol.com^$elemhide
 @@||bing.com/th?*^pid=Ads$image,domain=search.aol.com|o2suche.aol.de|aolsearch.com|search.aol.co.uk|search.aol.ca|recherche.aol.fr|suche.aol.de
 @@||yellowpages.aol.com^$elemhide
-@@||job-sift.com/search^$elemhide
-@@||housingwatch.com/search^$elemhide
-@@||going.com/search^$elemhide
-@@||citypedia.com/search^$elemhide
-@@||health247.com/search^$elemhide
-@@||netdeals.com/search^$elemhide
-@@||netfind.com/search^$elemhide
+@@||job-sift.com^$elemhide
+@@||housingwatch.com^$elemhide
+@@||going.com^$elemhide
+@@||citypedia.com^$elemhide
+@@||health247.com^$elemhide
+@@||netdeals.com^$elemhide
+@@||netfind.com^$elemhide
 
 ! reverso.net ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=22492)
 @@||reverso.net^*/Static/JS/advertising.js?ch=1$domain=reverso.net
 @@||partner.googleadservices.com/gpt/pubads_$script,domain=reverso.net
 @@||g.doubleclick.net/gampad/ads?$script,domain=reverso.net
 @@||g.doubleclick.net/pagead/ads?*^h=250^*^w=300^$subdocument,domain=reverso.net
 @@||g.doubleclick.net/pagead/ads?*^h=600^*^w=160^$subdocument,domain=reverso.net
 @@||g.doubleclick.net/pagead/ads?*^h=90^*^w=728^$subdocument,domain=reverso.net
@@ -8530,24 +8529,24 @@ spanishdict.com#@#.ad-unit
 @@||vk.com/ads_rotate.php?act=$xmlhttprequest,domain=vk.com
 @@||ad.mail.ru/adq/?$script,domain=vk.com
 vk.com#@#.ads_ads_box
 vk.com#@#.ads_ad_box
 vk.com#@#.ads_ad_box2
 vk.com#@##ads_left *
 vk.com#@##ads_left
 ! https://adblockplus.org/forum/viewtopic.php?p=164327#p164327
-<<<<<<< mine
+<<<<<<< mine
 vk.com#@#div[data-ad-view]
 vk.com#@#div[data-ad]
 @@||vk.com/ads_light.php$domain=vk.com
-=======
+=======
 ! vk.com#@#div[data-ad-view]
 ! vk.com#@#div[data-ad]
->>>>>>> theirs
+>>>>>>> theirs
 
 ! pressfire.no ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=45115)
 @@||adform.net^$script,domain=pressfire.no|framerate.no
 @@||adform.net^$image,domain=pressfire.no|framerate.no
 @@||doubleclick.net/ddm/$popup,image,domain=pressfire.no|framerate.no
 @@||servedby.flashtalking.com/imp/$image,domain=pressfire.no|framerate.no
 @@||pressfire.no/js/blockerTracker/assets/advertisement.dummy.js?$domain=pressfire.no
 @@||framerate.no/js/blockerTracker/assets/advertisement.dummy.js?$domain=framerate.no