From: Steven Black <redacted>
Date: Wed, 31 Jul 2013 01:32:38 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/l1m5/hosts into l1m5-master
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=d815858cda130f7838ff07d50a132727bf41416f;p=stevenblack-hosts.git

Merge branch 'master' of https://github.com/l1m5/hosts into l1m5-master

# By Ben Limmer
# Via Ben Limmer
* 'master' of https://github.com/l1m5/hosts:
  Source update.
  Added query to user for moving the hosts file into place.
  Source update.
  Correcting syntax error with elif.
  Added back instructions for Windows users on where to move their hosts file to. Resolves #5. I'm opening a new issue for adding this for Windows.
  Added support for automatically moving the hosts file into place and flushing the DNS Cache for Mac and Linux. This addresses part of Issue #5, but I still need to do Windows.
  Updated sources.
  Write out how many unique entries were generated in the readme.md file. Resolves #3.
  Print out copy locations on success. Now it's easy to copy/paste where the host file needs to go.
  Updating sources
  Source update.
  Update sources.
  Updated from sources.
  Updated sources.
  Updated hosts files.
  Update sources.
  Updated sources and hosts file.
  Source update.

Conflicts:
	data/malwaredomainlist.com/hosts
	data/mvps.org/hosts
	data/someonewhocares.org/hosts
	hosts
	readme.md
---

d815858cda130f7838ff07d50a132727bf41416f
diff --cc data/malwaredomainlist.com/hosts
index 7fcab9fd2,29a5cff6c..e98240d01
--- a/data/malwaredomainlist.com/hosts
+++ b/data/malwaredomainlist.com/hosts
@@@ -1,6 -1,6 +1,10 @@@
  #               MalwareDomainList.com Hosts List           #
  #   http://www.malwaredomainlist.com/hostslist/hosts.txt   #
++<<<<<<< HEAD
 +#         Last updated: Wed, 05 Jun 13 20:18:18 +0000      #
++=======
+ #         Last updated: Tue, 30 Jul 13 13:35:13 +0000      #
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  
  
  127.0.0.1  localhost
@@@ -265,6 -269,7 +273,10 @@@
  127.0.0.1  complainpaywall.net
  127.0.0.1  conds.ru
  127.0.0.1  config.shopperreports.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  conqueronline-co.91.com.tqpoint.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  cookingwithmarijuana.com
  127.0.0.1  costcopainlessly.org
  127.0.0.1  count.fuckunion.com
@@@ -390,6 -400,7 +407,10 @@@
  127.0.0.1  f-kotek.com
  127.0.0.1  facebook.churchblend.com
  127.0.0.1  famagatra.ru
++<<<<<<< HEAD
++=======
+ 127.0.0.1  fanning.homilybbk.in
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  faq-candrive.tk
  127.0.0.1  farishtech.com
  127.0.0.1  fars-rizan.com
@@@ -905,6 -926,7 +936,10 @@@
  127.0.0.1  soberthingingmon.com
  127.0.0.1  soberthingingmon.net
  127.0.0.1  socks.vpgconsulting.com.br
++<<<<<<< HEAD
++=======
+ 127.0.0.1  soft245.ru
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  softproworld.com
  127.0.0.1  softwarea-z.com
  127.0.0.1  solonmdr.xpg.com.br
@@@ -1179,6 -1210,7 +1223,10 @@@
  127.0.0.1  www.marlaktuell.de
  127.0.0.1  www.marques.pro.br
  127.0.0.1  www.masimpex.com.br
++<<<<<<< HEAD
++=======
+ 127.0.0.1  www.matteplanet.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.molesa.xpg.com.br
  127.0.0.1  www.mpsystem.it
  127.0.0.1  www.muzeeum.nl
diff --cc data/mvps.org/hosts
index 28d970dd5,7da892bce..3ab25fb97
--- a/data/mvps.org/hosts
+++ b/data/mvps.org/hosts
@@@ -6,7 -6,7 +6,11 @@@
  # This *must* be the first line: 127.0.0.1     localhost   #
  #                                                          #
  #**********************************************************#
++<<<<<<< HEAD
 +# ---------------- Updated: May-21-2013 ------------------ #
++=======
+ # ---------------- Updated: July-08-2013 ----------------- #
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  #**********************************************************#
  #                                                          #
  # Disclaimer: this file is free to use for personal use    #
@@@ -96,7 -100,6 +104,10 @@@
  127.0.0.1  adhitzads.com
  127.0.0.1  ssl3.adhost.com
  127.0.0.1  www2.adhost.com
++<<<<<<< HEAD
 +127.0.0.1  mztag.ad-indicator.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adfarm1.adition.com
  127.0.0.1  imagesrv.adition.com
  127.0.0.1  ad.adition.net
@@@ -249,8 -253,6 +261,11 @@@
  127.0.0.1  adv.adwish.net
  127.0.0.1  ads.adwitserver.com
  127.0.0.1  ad.adworx.at
++<<<<<<< HEAD
 +127.0.0.1  adxmarket.com #[server down?]
 +127.0.0.1  ad.adxmarket.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.ad-z.de
  127.0.0.1  ads.afa.net
  127.0.0.1  affelix.com
@@@ -277,7 -279,7 +292,11 @@@
  127.0.0.1  ac.ajur.info #[WebBug]
  127.0.0.1  openx.ajur.info
  127.0.0.1  adlik2.akavita.com
++<<<<<<< HEAD
 +127.0.0.1  ads1.a-lehdet.fi
++=======
+ 127.0.0.1  ads1.a-lehdet.fi #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  log.aliiike.com
  127.0.0.1  ads.allaccess.com.ph
  127.0.0.1  adcontent2.allaccess.com.ph
@@@ -328,6 -331,7 +348,10 @@@
  127.0.0.1  ads.associatedcontent.com
  127.0.0.1  atemda.com
  127.0.0.1  rules.atgsvcs.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  ads.atticamediagroup.gr
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.auctionads.com
  127.0.0.1  banners.audioholics.com
  127.0.0.1  ad.auditude.com
@@@ -377,6 -381,7 +401,10 @@@
  127.0.0.1  stat.bdirect.ru
  127.0.0.1  ad.beepworld.de
  127.0.0.1  ads.be2hand.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  app.beanstalkdata.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.beead.co.uk
  127.0.0.1  tracker.beezup.com
  127.0.0.1  autocontext.begun.ru
@@@ -463,7 -465,6 +488,10 @@@
  127.0.0.1  ads.btv.bg
  127.0.0.1  ads.buljobs.bg
  127.0.0.1  ivitrine.buscape.com
++<<<<<<< HEAD
 +127.0.0.1  vitrine.buscape.com.br #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.business.hr
  127.0.0.1  ads.businessclick.com
  127.0.0.1  ads.businessclick.pl
@@@ -666,10 -670,10 +697,17 @@@
  127.0.0.1  ay.eastmoney.com
  127.0.0.1  www.easy-dating.org
  127.0.0.1  top.easy.lv
++<<<<<<< HEAD
 +127.0.0.1  easytrader.bg
 +127.0.0.1  ads.easytrader.bg
 +127.0.0.1  static.easytrader.bg
 +127.0.0.1  www.ebaneri.com #[server down?]
++=======
+ 127.0.0.1  web2.easyresearch.se
+ 127.0.0.1  easytrader.bg
+ 127.0.0.1  ads.easytrader.bg
+ 127.0.0.1  static.easytrader.bg
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.ebannertraffic.com
  127.0.0.1  ox.e-card.bg
  127.0.0.1  ox-s.e-card.bg
@@@ -772,7 -777,6 +811,10 @@@
  127.0.0.1  error.fc2.com
  127.0.0.1  feedjit.com
  127.0.0.1  log.feedjit.com
++<<<<<<< HEAD
 +127.0.0.1  ads.fema-bg.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  analytics.femalefirst.co.uk
  127.0.0.1  pixel.fetchback.com
  127.0.0.1  banners.ffsbg.com
@@@ -804,7 -808,7 +846,11 @@@
  127.0.0.1  forvideo.at
  127.0.0.1  ads.foxnews.com
  127.0.0.1  www.fpcclicks.com
++<<<<<<< HEAD
 +127.0.0.1  f-questionnaire.com
++=======
+ 127.0.0.1  f-questionnaire.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ad.freecity.de
  127.0.0.1  ads05.freecity.de
  127.0.0.1  maurobb.freecounter.it
@@@ -837,7 -841,6 +883,10 @@@
  127.0.0.1  ads.gamelink.com
  127.0.0.1  ingameads.gameloft.com
  127.0.0.1  adv.gamerzhut.com
++<<<<<<< HEAD
 +127.0.0.1  www.gamersbanner.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.garga.biz
  127.0.0.1  ads.gather.com
  127.0.0.1  track.gawker.com #[WebBug]
@@@ -881,7 -884,6 +930,10 @@@
  127.0.0.1  ad-incisive.grapeshot.co.uk
  127.0.0.1  reed-cw.grapeshot.co.uk
  127.0.0.1  adv.gratuito.st
++<<<<<<< HEAD
 +127.0.0.1  graq.ru #[ScamFraudAlert.Pharmacy][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  rma-api.gravity.com
  127.0.0.1  www.greasypalm.co.uk #[PcTools.GreasyPalm bar]
  127.0.0.1  adserver.gruprc.ro
@@@ -1048,6 -1050,7 +1100,10 @@@
  127.0.0.1  ilead.itrack.it
  127.0.0.1  adserver.itsfogo.com
  127.0.0.1  partnerfeed.itsfogo.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  stats.itweb.co.za
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  link.ixs1.net #[WebBug]
  # [J]
  127.0.0.1  ad.jamba.de
@@@ -1249,7 -1254,6 +1307,10 @@@
  127.0.0.1  adserver.gb3.motorpresse.de
  127.0.0.1  ads.mp3-online.com.ua
  127.0.0.1  www1.mpnrs.com
++<<<<<<< HEAD
 +127.0.0.1  www.ads.mrejata.net
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  msgtag.com #[Email tracker]
  127.0.0.1  img.msgtag.com
  127.0.0.1  www.msgtag.com
@@@ -1326,7 -1330,6 +1387,10 @@@
  127.0.0.1  rbk.netmng.com
  127.0.0.1  www.netmaxx.com
  127.0.0.1  ads.netrition.com
++<<<<<<< HEAD
 +127.0.0.1  servedby.netshelter.net #[Tracking.Cookie][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adserver.networkvision.net
  127.0.0.1  ads.neudesicmediagroup.com
  127.0.0.1  ads.newdream.net
@@@ -1348,7 -1351,7 +1412,11 @@@
  127.0.0.1  www2.nicheseek.com
  127.0.0.1  adserve5.nikkeibp.co.jp
  127.0.0.1  bizad.nikkeibp.co.jp
++<<<<<<< HEAD
 +127.0.0.1  feed4a.nixxie.com
++=======
+ 127.0.0.1  feed4a.nixxie.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.nlbanner.nl
  127.0.0.1  banner.nonstoppartner.de
  127.0.0.1  counter.nope.dk
@@@ -1597,7 -1609,6 +1674,10 @@@
  127.0.0.1  p.rfihub.com
  127.0.0.1  richmedia247.com
  127.0.0.1  overlay.ringtonematcher.com
++<<<<<<< HEAD
 +127.0.0.1  tracking.ringtonematcher.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  db.riskwaters.com #[WebTrends]
  127.0.0.1  rightstats.com
  127.0.0.1  www.rightstats.com
@@@ -1700,7 -1711,6 +1780,10 @@@
  127.0.0.1  l.socialsexnetwork.net
  127.0.0.1  a.softconsultgroup.com
  127.0.0.1  pub.softonic.com
++<<<<<<< HEAD
 +127.0.0.1  www.software4yoursuccess.com #[Froggie Scan]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  sacdcad02.salon.com
  127.0.0.1  tenbux.somethingawful.com
  127.0.0.1  ivox.socratos.net
@@@ -1721,7 -1731,6 +1804,10 @@@
  127.0.0.1  sitestat3.sport1.de
  127.0.0.1  www.speedcounter.net
  127.0.0.1  www.sptag.com #[WebBug]
++<<<<<<< HEAD
 +127.0.0.1  www.spybot-spyware-removal.com #[palsol.com][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  springclick.com
  127.0.0.1  www.spywareit.com
  127.0.0.1  www.spywarekiller.net #[Rogue/Suspect]
@@@ -1746,7 -1755,6 +1832,10 @@@
  127.0.0.1  ads001.stickam.com
  127.0.0.1  t1.stormiq.com
  127.0.0.1  analytics.strangeloopnetworks.com
++<<<<<<< HEAD
 +127.0.0.1  ads.streetfire.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  gsorder.berlin.strato.de
  127.0.0.1  adv.stznews.bg
  127.0.0.1  www.sublimemedia.net
@@@ -1798,12 -1806,10 +1887,18 @@@
  127.0.0.1  members.popup.tbn.ru
  127.0.0.1  traffic.tcmagnet.com
  127.0.0.1  oa.techcrunch.com
++<<<<<<< HEAD
 +127.0.0.1  www.tekeffect.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adv.technews.bg
  127.0.0.1  ads.tele.net
  127.0.0.1  adserver.tele.net
  127.0.0.1  sdc.tele.net
++<<<<<<< HEAD
 +127.0.0.1  adserver.teracent.net #[Tracking.Cookie][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  banner.terminal.hu
  127.0.0.1  stf.terra.com.br
  127.0.0.1  ad.terra.com.mx
@@@ -1935,7 -1941,7 +2030,11 @@@
  127.0.0.1  adclient1.tucows.com
  127.0.0.1  counts.tucows.com
  127.0.0.1  google.tucows.com
++<<<<<<< HEAD
 +127.0.0.1  adextensioncontrol.tudou.com
++=======
+ 127.0.0.1  adextensioncontrol.tudou.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  stats.tunt.lv
  127.0.0.1  d.turn.com
  127.0.0.1  ad.tv2.no #[RealMedia]
@@@ -2188,6 -2195,7 +2288,10 @@@
  127.0.0.1  ad.yourmedia.com
  127.0.0.1  ad1.yourmedia.com
  127.0.0.1  ad.yoyo.pl
++<<<<<<< HEAD
++=======
+ 127.0.0.1  pc2.yumenetworks.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Z]
  127.0.0.1  ads.zamunda.net
  127.0.0.1  ad.zanox.com
@@@ -2292,7 -2300,6 +2396,10 @@@
  127.0.0.1  adverts.trojanpublishing.net
  # [1-800-hosting][AS33210][69.41.160.0 - 69.41.191.255]
  127.0.0.1  www.clickog.com
++<<<<<<< HEAD
 +127.0.0.1  www.jadesearch.net
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.ineedhits.com
  127.0.0.1  track.lativio.com
  127.0.0.1  track2.me
@@@ -2648,7 -2655,6 +2755,10 @@@
  127.0.0.1  analytics.admob.com
  127.0.0.1  jp.admob.com
  127.0.0.1  p.admob.com #[Mobile.Advertising]
++<<<<<<< HEAD
 +127.0.0.1  r.admob.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Admob][AS22577][70.32.128.0 - 70.32.159.255]
  127.0.0.1  mm.admob.com
  127.0.0.1  mm1.vip.sc1.admob.com
@@@ -2760,7 -2764,6 +2868,10 @@@
  127.0.0.1  searchnowqa.com
  # [Advancedhosters / LeaseWeb][AS39572][88.208.0.0 - 88.208.11.255]
  127.0.0.1  st.pc.adonweb.ru
++<<<<<<< HEAD
 +127.0.0.1  adulttraffic.ru #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  admin.amateurgalls.com
  127.0.0.1  jps.ru
  127.0.0.1  www.jps.ru #[adslim.com]
@@@ -2769,7 -2772,6 +2880,10 @@@
  127.0.0.1  a3.mediagra.com
  127.0.0.1  a4.mediagra.com
  127.0.0.1  a5.mediagra.com
++<<<<<<< HEAD
 +127.0.0.1  mytraff.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  st.pay-click.ru
  127.0.0.1  rb-net.com
  127.0.0.1  ads.xhamster.com
@@@ -2843,6 -2845,8 +2957,11 @@@
  127.0.0.1  videodetectivenetwork.valuead.com
  127.0.0.1  vdn.valuead.com
  127.0.0.1  yahooads.valuead.com
++<<<<<<< HEAD
++=======
+ # [Akamai][AS20940][125.56.128.0 - 125.56.255.255]
+ 127.0.0.1  cdn-static.liverail.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Akamai / NTT][AS2914][AS26769][184.24.0.0 - 184.31.255.255]
  127.0.0.1  www.77tracking.com
  127.0.0.1  ak1s.abmr.net
@@@ -2947,7 -2951,7 +3066,11 @@@
  127.0.0.1  ad2.turn.com
  127.0.0.1  urls.api.twitter.com
  127.0.0.1  media-0.vpptechnologies.com
++<<<<<<< HEAD
 +# [Akamai][AS20940][96.16.0.0 - 96.17.255.255]
++=======
+ # [Akamai][AS20940][AS12989][96.16.0.0 - 96.17.255.255]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  a.adroll.com
  127.0.0.1  content.budsinc.com
  127.0.0.1  cts.channelintelligence.com #[switch.atdmt.com]
@@@ -3054,8 -3059,6 +3178,11 @@@
  127.0.0.1  http-logs.loggly.com
  127.0.0.1  logs.loggly.com #[WebBug]
  127.0.0.1  cmi.netseer.com
++<<<<<<< HEAD
 +127.0.0.1  brocade.netshelter.net
 +127.0.0.1  track.prd1.netshelter.net
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  log3.optimizely.com
  127.0.0.1  config.parsely.com
  127.0.0.1  pinion.gg
@@@ -3068,8 -3071,7 +3195,12 @@@
  127.0.0.1  mail.pinion.gg
  127.0.0.1  motd.pinion.gg #[Game Adverts]
  127.0.0.1  pog.gg
++<<<<<<< HEAD
 +127.0.0.1  pog.pinion.gg
 +127.0.0.1  stage.pinion.gg #[server down?]
++=======
+ 127.0.0.1  pog.pinion.gg #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  tix.pinion.gg
  127.0.0.1  video.pinion.gg
  127.0.0.1  wiki.pinion.gg
@@@ -3118,7 -3120,6 +3249,10 @@@
  127.0.0.1  a.lingospot.com #[WebBug]
  127.0.0.1  ads.mobclix.com
  127.0.0.1  s.mobclix.com
++<<<<<<< HEAD
 +127.0.0.1  adv.netshelter.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  a1.opentracker.net
  127.0.0.1  indium.openx.net
  127.0.0.1  cid.pardot.com
@@@ -3159,7 -3163,11 +3296,14 @@@
  127.0.0.1  dni.agcdn.com
  127.0.0.1  t13.intelliad.de
  127.0.0.1  t23.intelliad.de
+ 127.0.0.1  tracker.vinsight.de
  # [Amazon.com][AS16509][178.236.0.0 - 178.236.7.255]
++<<<<<<< HEAD
++=======
+ # [Amazon.com][AS16509][184.169.128.0 - 184.169.255.255]
+ 127.0.0.1  rainbow-us.mythings.com
+ 127.0.0.1  rainbow-geo-p.mythings.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Amazon.com][AS14618][184.72.0.0 - 184.73.255.255]
  127.0.0.1  ad.adanglers.com
  127.0.0.1  ads.adhub.co.nz
@@@ -3173,7 -3181,6 +3317,10 @@@
  127.0.0.1  ads.investingchannel.com
  127.0.0.1  o1.inviziads.com
  127.0.0.1  tracker.issuu.com
++<<<<<<< HEAD
 +127.0.0.1  pixel.klout.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  r.openx.net
  127.0.0.1  clicks.pureleads.com
  127.0.0.1  technologyreview.qwobl.net
@@@ -3225,6 -3232,7 +3372,10 @@@
  127.0.0.1  assets.luminate.com
  127.0.0.1  static.luminate.com
  127.0.0.1  content.mkt922.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  t.neodatagroup.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  track.netshelter.net
  127.0.0.1  static.parsely.com
  127.0.0.1  adimg.pixazza.com
@@@ -3337,14 -3346,22 +3489,31 @@@
  127.0.0.1  www.wtp101.com
  127.0.0.1  zdbb.net
  # [Amazon.com][AS16509][54.224.0.0 - 54.239.255.255]
++<<<<<<< HEAD
++127.0.0.1  beam.hlserve.com
++=======
+ 127.0.0.1  t.beanstalkdata.com
+ 127.0.0.1  hj.flxpxl.com
  127.0.0.1  beam.hlserve.com
+ 127.0.0.1  cdn.ip.inpwrd.com
+ 127.0.0.1  cdn.libraries.inpwrd.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  stat.komoona.com
  # [Amazon.com][AS16509][54.240.0.0 - 54.255.255.255]
  127.0.0.1  ads.adiply.com
  127.0.0.1  srv.admailtiser.com
  127.0.0.1  cdn.adual.net
++<<<<<<< HEAD
 +127.0.0.1  blockmetrics.com
 +127.0.0.1  tc-s.convertro.com
++=======
+ 127.0.0.1  serve.bannersdontwork.com
+ 127.0.0.1  blockmetrics.com
+ 127.0.0.1  engine.carbonads.com
+ 127.0.0.1  static.carbonads.com
+ 127.0.0.1  tc-s.convertro.com
+ 127.0.0.1  track.customer.io
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  error.demdex.net
  127.0.0.1  gannett.demdex.net
  127.0.0.1  cf.effectivemeasure.net
@@@ -3356,12 -3373,14 +3525,20 @@@
  127.0.0.1  banners.gossipcenter.com
  127.0.0.1  ads.groupcommerce.com
  127.0.0.1  adserv.impactengine.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  adn.impactradius.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  scripts.kissmetrics.com
  127.0.0.1  ads.lanistaads.com
  127.0.0.1  engine.marketfly.net
  127.0.0.1  content.mkt51.net
  127.0.0.1  content.mkt941.com
  127.0.0.1  tracker.mozo.com.au
++<<<<<<< HEAD
++=======
+ 127.0.0.1  static.nectarads.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ortc-ws2.realtime.co
  127.0.0.1  ortc-ws2-useast1-S0005.realtime.co
  127.0.0.1  admp-tc.sanoma.fi
@@@ -3701,14 -3720,14 +3878,24 @@@
  127.0.0.1  secure-id.impressiondesk.com
  127.0.0.1  ad.netcommunities.com
  127.0.0.1  ads.networkhm.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  ads.pubsqrd.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.sonobi.com
  127.0.0.1  ads.suite6ixty6ix.com
  127.0.0.1  ads.vntsm.com
  127.0.0.1  an.z5x.net
++<<<<<<< HEAD
 +# [Appserve Technologies][AS23376][64.241.102.160 - 64.241.102.191]
 +127.0.0.1  aries-search.com
 +# [Appserve Technologies][AS23376][66.101.58.0 - 66.101.58.255]
 +# [Argeweb Network][AS8315][193.34.150.0 - 193.34.151.255]
++=======
+ # [Appserve][AS23376][64.241.102.160 - 64.241.102.191]
+ # [Appserve][AS23376][66.101.58.0 - 66.101.58.255]
+ # [Argeweb][AS8315][193.34.150.0 - 193.34.151.255]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  b.ds1.nl
  127.0.0.1  k1s.nl #[Daisycon]
  127.0.0.1  affiliates.kliks.nl
@@@ -3911,7 -3931,6 +4099,10 @@@
  127.0.0.1  update.smart-browser.com
  127.0.0.1  www.smart-browser.com #[Adware.SmartBrowser]
  # [Bezeq][AS8551][62.219.49.0 - 62.219.50.255]
++<<<<<<< HEAD
 +127.0.0.1  banners.acw-digital.info #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Bezeq][AS8551][81.218.31.128 - 81.218.31.255]
  127.0.0.1  creative.xtendmedia.com
  # [Bezeq][AS8551][82.80.204.0 - 82.80.239.255]
@@@ -4093,7 -4111,7 +4283,11 @@@
  127.0.0.1  www6.burstnet.com
  127.0.0.1  www.burstnet.akadns.net
  # [BurstNet][AS21788][173.212.192.0 - 173.212.255.255]
++<<<<<<< HEAD
 +127.0.0.1  disco.flashbannernow.com #[server down?]
++=======
+ 127.0.0.1  disco.flashbannernow.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.quantcheck.com
  # [BurstNet][AS21788][184.82.0.0 - 184.82.255.255]
  127.0.0.1  www.adserv8.com
@@@ -4134,7 -4152,6 +4328,10 @@@
  127.0.0.1  engine.phn.doublepimp.com
  127.0.0.1  cdn.engine.phn.doublepimp.com
  127.0.0.1  streamate.doublepimp.com
++<<<<<<< HEAD
 +127.0.0.1  ads.parkedskins.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  rts.pgmediaserve.com
  127.0.0.1  rts.revfusion.net
  # [Calpop.com / Airlinereservations.com][AS7796][208.70.72.0 - 208.70.79.255]
@@@ -4690,9 -4706,7 +4886,13 @@@
  127.0.0.1  ads2.playnet.com
  127.0.0.1  as5000.wunderground.com
  # [Colo4dallas][AS30496][206.123.64.0 - 206.123.127.255]
++<<<<<<< HEAD
 +127.0.0.1  efp.ns3.bidsystem.com #[Adknowledge][server down?]
  127.0.0.1  pda.mv.bidsystem.com
 +127.0.0.1  us01.xmlsearch.findwhat.com #[server down?]
++=======
++127.0.0.1  pda.mv.bidsystem.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Colo4dallas][AS30496][67.222.133.86 - 67.222.133.93]
  127.0.0.1  imgc.psychcentral.com
  # [Coloc8][AS33536][64.128.87.0 - 64.128.87.255]
@@@ -5293,7 -5309,6 +5495,10 @@@
  127.0.0.1  server.iad.liveperson.net
  # [Euroaccess][AS34305][193.138.220.0 - 193.138.231.255]
  127.0.0.1  www.hostedbanners.com
++<<<<<<< HEAD
 +127.0.0.1  banner.sextorrent.to #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  landingpages.sunnytoolz.com
  # [Euroaccess][AS34305][85.12.0.0 - 85.12.63.255]
  127.0.0.1  ads.guru3d.com
@@@ -5327,7 -5339,6 +5529,10 @@@
  127.0.0.1  ad7.literotica.com
  # [Ezzi.net][66.199.224.0 - 66.199.255.255]
  # [Ezzi.net][AS15149][72.9.96.0 - 72.9.111.255]
++<<<<<<< HEAD
 +127.0.0.1  klikcentral.com #[ScamFraudAlert.Pharmacy]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Facebook]
  127.0.0.1  ads.ak.facebook.com
  127.0.0.1  creative.ak.facebook.com
@@@ -5372,7 -5383,6 +5577,10 @@@
  # [Fdcservers.net][74.63.64.0 - 74.63.95.255]
  127.0.0.1  www.1freecounter.com
  # [Fdcservers.net][76.73.0.0 - 76.73.127.255]
++<<<<<<< HEAD
 +127.0.0.1  secure.33drugs.com #[ScamFraudAlert.Pharmacy][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  jizzads.com
  127.0.0.1  www.jizzads.com
  # [Fedora-Hosting][88.85.81.0 - 88.85.81.255]
@@@ -5569,7 -5579,7 +5777,11 @@@
  127.0.0.1  ads.sxx.com
  127.0.0.1  ads.vipcams.com
  # [Gandi][AS29169][95.142.160.0 - 95.142.167.255]
++<<<<<<< HEAD
 +127.0.0.1  stats.mondespersistants.com
++=======
+ 127.0.0.1  stats.mondespersistants.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [GeMius]
  127.0.0.1  hit.gemius.pl #[Tracking.Cookie]
  127.0.0.1  activeby.hit.gemius.pl
@@@ -5853,7 -5862,7 +6064,11 @@@
  127.0.0.1  www.codeads.com
  127.0.0.1  14.ca.enwebsearch.com
  127.0.0.1  www.ewebse.com
++<<<<<<< HEAD
 +127.0.0.1  www.freehitwebsitecounter.com
++=======
+ 127.0.0.1  www.freehitwebsitecounter.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.freehitwebcounters.com
  127.0.0.1  www.milesdebanners.com
  127.0.0.1  redemptionengine.com #[SiteAdvisor.redemptionengine.com]
@@@ -5870,8 -5879,6 +6085,10 @@@
  # [Godaddy.com / Aster Edward Umali][Azter Inc][68.178.128.0 - 68.178.255.255]
  127.0.0.1  www.azter.com #[SiteAdvisor.azter.com]
  127.0.0.1  www.bestsexycelebs.com
++<<<<<<< HEAD
 +127.0.0.1  www.hunkymalecelebs.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  sexybabesx.com #[Win32/TrojanDownloader.Adload.NBH]
  127.0.0.1  adrianalima.sexybabesx.com
  127.0.0.1  aliciakeys.sexybabesx.com #[AdWare.Win32.WinAD.bv]
@@@ -6022,6 -6029,7 +6239,10 @@@
  127.0.0.1  www.appliedsemantics.com
  127.0.0.1  service.urchin.com #[Urchin Tracking Module]
  # [Google][AS15169][108.170.192.0 - 108.170.255.255]
++<<<<<<< HEAD
++=======
+ 127.0.0.1  bec.px.invitemedia.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  conversion-pixel.invitemedia.com
  # [Google / DoubleClick][AS15169][173.194.0.0 - 173.194.255.255]
  127.0.0.1  dp.g.doubleclick.net
@@@ -6164,7 -6172,6 +6385,10 @@@
  # [GTS Nextra / PrimeInteractive][AS5578][85.248.229.0 - 85.248.229.255]
  127.0.0.1  ad.sitelement.sk
  # [Hanaro Telecom][AS9318][114.200.0.0 - 114.207.255.255]
++<<<<<<< HEAD
 +127.0.0.1  ad.nsonmedia.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Hetzner][AS24940][144.76.0.0 - 144.76.255.255]
  127.0.0.1  c.am11.ru
  # [Hetzner][AS24940][176.9.0.0 - 176.9.255.255]
@@@ -6172,6 -6179,7 +6396,10 @@@
  127.0.0.1  advertising.fussball-liveticker.eu
  127.0.0.1  adv.medicine.bg
  127.0.0.1  e.mouseflow.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  mp.pianomedia.eu
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  app3.rutarget.ru
  127.0.0.1  adserver.spritmonitor.de
  127.0.0.1  trafficconverter.in
@@@ -6346,14 -6353,12 +6573,20 @@@
  127.0.0.1  ads.blitz.bg
  127.0.0.1  ads-bg.net
  127.0.0.1  ads.den.bg
++<<<<<<< HEAD
 +127.0.0.1  ads.foxtv.bg #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  b.grabo.bg
  127.0.0.1  ads.hobyto.com
  127.0.0.1  ads.popfolkstars.com
  127.0.0.1  ad.sbb.bg
  127.0.0.1  reklama.wisdom.bg
  # [HostDime.com][AS33182][66.7.192.0 - 66.7.223.255]
++<<<<<<< HEAD
 +127.0.0.1  www.conficker.name #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.dancingsnakegames.com
  127.0.0.1  www.disable-uac.com
  127.0.0.1  www.money4ads.com
@@@ -6457,7 -6456,6 +6684,10 @@@
  127.0.0.1  a.ads.t-online.de #[AdSolution-Website-Tag]
  127.0.0.1  admin.ads.t-online.de
  127.0.0.1  s.ads.t-online.de
++<<<<<<< HEAD
 +127.0.0.1  a.banner.t-online.de #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  count.passul.t-online.de
  # [Hungarian Telecom / T-online][80.150.6.0 - 80.150.7.255]
  127.0.0.1  homepage.t-online.de
@@@ -6516,7 -6514,6 +6746,10 @@@
  127.0.0.1  ads.ips7.bg
  127.0.0.1  ads.mixbg.net
  127.0.0.1  mvmads.com
++<<<<<<< HEAD
 +127.0.0.1  banners.novfolk.bg #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.petvet.bg
  127.0.0.1  advert.technews.bg
  127.0.0.1  ad.thesimplecomplex.bg
@@@ -6598,6 -6595,7 +6831,10 @@@
  127.0.0.1  g-f5fun.count.brat-online.ro
  127.0.0.1  g-f5news.count.brat-online.ro
  127.0.0.1  g-protv.count.brat-online.ro
++<<<<<<< HEAD
++=======
+ 127.0.0.1  hotnews.count.brat-online.ro
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  profm.count.brat-online.ro
  127.0.0.1  mtv.count.brat-online.ro
  127.0.0.1  myvideo.count.brat-online.ro
@@@ -6645,16 -6643,12 +6882,22 @@@
  127.0.0.1  internetfuel.searchcentrix.com
  127.0.0.1  www.searchcentrix.com #[VisiCom.SearchCentric]
  # [Inflow / myGeek.com][66.179.234.160 - 66.179.234.191]
++<<<<<<< HEAD
 +127.0.0.1  adonlist.com #[server down?]
 +127.0.0.1  adonlistings.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  context.adontext.com
  127.0.0.1  context2.adontext.com
  127.0.0.1  banner.adtrgt.com
  127.0.0.1  popunder.adtrgt.com
  127.0.0.1  transition.adtrgt.com
  127.0.0.1  url.adtrgt.com
++<<<<<<< HEAD
 +127.0.0.1  ad.cpvfeed.com #[SiteAdvisor.cpvfeed.com]
 +127.0.0.1  keyword.cpvfeed.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  offeroptimizer.mygeek.com
  127.0.0.1  searchhippo.mygeek.com
  127.0.0.1  webalize.mygeek.com
@@@ -6812,11 -6803,8 +7052,16 @@@
  127.0.0.1  p.chango.com
  127.0.0.1  lfov.net
  # [Internap / Namemedia][AS14742][64.95.64.0 - 64.95.64.255]
++<<<<<<< HEAD
 +127.0.0.1  bannerx.seeq.com #[server down?]
 +127.0.0.1  smds.seeq.com #[server down?]
 +127.0.0.1  adserver.sitesense.com #[Parking Service]
 +# [Internap][AS10913][66.150.0.0 - 66.151.255.255]
 +127.0.0.1  int.teracent.net #[server down?]
++=======
+ 127.0.0.1  adserver.sitesense.com #[Parking Service]
+ # [Internap][AS10913][66.150.0.0 - 66.151.255.255]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  cdn.visiblemeasures.com
  # [Internap / Pinball][AS14744][64.94.137.0 - 64.94.137.127]
  127.0.0.1  partners.clickpotato.com
@@@ -6858,7 -6846,6 +7103,10 @@@
  127.0.0.1  papaeagle.powered-by.seekmo.com
  127.0.0.1  pokemonpictures.powered-by.seekmo.com
  127.0.0.1  xfreelesbianmovies.powered-by.seekmo.com
++<<<<<<< HEAD
 +127.0.0.1  ad.ytsa.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  gec.zango.com
  # [Internap / Webhosting][AS12180][67.215.160.0 - 67.215.191.255]
  127.0.0.1  affiliate.trk4.com
@@@ -6921,7 -6909,6 +7170,10 @@@
  127.0.0.1  js.revsci.net
  127.0.0.1  jsl.revsci.net
  127.0.0.1  pix01.revsci.net #[TrackingPixelCode]
++<<<<<<< HEAD
 +127.0.0.1  pix02.revsci.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  pix03.revsci.net
  127.0.0.1  pix04.revsci.net
  127.0.0.1  revsci.tvguide.com
@@@ -7062,7 -7044,6 +7309,10 @@@
  127.0.0.1  www.singlesadnetwork.com
  127.0.0.1  mf.sitescout.com
  127.0.0.1  reboot.sitescout.com
++<<<<<<< HEAD
 +127.0.0.1  sorento.sitescout.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  vom.sitescout.com
  127.0.0.1  wam-ads.sitescout.com
  # [Isprime][66.230.128.0 - 66.230.191.255]
@@@ -7111,6 -7092,7 +7361,10 @@@
  127.0.0.1  tracking.craktraffic.com
  127.0.0.1  urchin.craktraffic.com
  127.0.0.1  www.elitedollars.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  free.fuckbook.cm
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  webmasters.h2porn.com
  127.0.0.1  ads.nudereviews.com
  127.0.0.1  www.oainternet.com
@@@ -7319,14 -7302,13 +7574,21 @@@
  127.0.0.1  internetserviceteam.com
  127.0.0.1  www.little-help.com
  # [Leaseweb][AS28753][37.1.216.0 - 37.1.223.255]
++<<<<<<< HEAD
 +127.0.0.1  counter.finemedia.net
++=======
+ 127.0.0.1  counter.finemedia.net #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Leaseweb][AS16265][46.243.0.0 - 46.243.7.255]
  127.0.0.1  www.awmads.com
  127.0.0.1  vktr073.net
  # [Leaseweb][AS16265][62.212.66.0 - 62.212.84.255]
  127.0.0.1  ads.adhood.com
  # [Leaseweb][82.192.69.0 - 82.192.88.127]
++<<<<<<< HEAD
 +127.0.0.1  openads.adjoema.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  img.clicksagent.com
  127.0.0.1  rubanners.com #[clicksagent.com]
  127.0.0.1  f18.static.fcdnx.com
@@@ -7343,13 -7325,12 +7605,20 @@@
  # [Leaseweb][AS16265][85.17.111.0 - 85.17.94.255]
  127.0.0.1  3animalsex.com
  127.0.0.1  www.3animalsex.com
++<<<<<<< HEAD
 +127.0.0.1  rpc.adclickjunky.net
++=======
+ 127.0.0.1  rpc.adclickjunky.net #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.adcode.ws
  127.0.0.1  a.adorika.net
  127.0.0.1  adv.adultpartnership.com
  127.0.0.1  counter.cam-content.com
  127.0.0.1  piwik.cam-content.com #[Piwik.Analytics]
++<<<<<<< HEAD
 +127.0.0.1  click.cheapestpriceviagra.com #[ScamFraudAlert.Pharmacy]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.crackserver.com #[StopBadware.Report]
  127.0.0.1  www.dbobs.com #[Spamdexing]
  127.0.0.1  ads2.ero-advertising.com
@@@ -7393,11 -7373,7 +7661,11 @@@
  127.0.0.1  counter.xeanon.com
  # [Leaseweb / Kolido.net][91.184.48.0 - 91.184.55.191]
  127.0.0.1  www.porncash.de
++<<<<<<< HEAD
 +127.0.0.1  ads.porncash.tv #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.porncash.tv
- 127.0.0.1  www.porndad.com
  # [Leaseweb][91.191.160.0 - 91.191.167.255]
  127.0.0.1  ads.kampanyatakip.net
  # [Leaseweb][94.75.198.0 - 94.75.198.255]
@@@ -7434,7 -7410,6 +7702,10 @@@
  127.0.0.1  s6.lebenna.com
  127.0.0.1  linktarget.com
  127.0.0.1  lw.lnkworld.com
++<<<<<<< HEAD
 +127.0.0.1  loltraf.ru #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  outtds.com
  127.0.0.1  cdn3.refusemedia.net
  127.0.0.1  adv.rockstar.bg
@@@ -7722,7 -7696,6 +7992,10 @@@
  127.0.0.1  adds.misiamoiatdom.com
  127.0.0.1  ad.moreto.net
  127.0.0.1  ads2.mystyle.bg
++<<<<<<< HEAD
 +127.0.0.1  adv.mytech.bg #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ad.onmedia.bg
  127.0.0.1  ads.ngm.bg
  127.0.0.1  ads.proyavi.bg
@@@ -7835,9 -7808,8 +8108,12 @@@
  127.0.0.1  www.hypercounter.com
  127.0.0.1  shared.juicybucks.com
  # [Master / Fast Internet][89.185.234.0 - 89.185.234.255]
- 127.0.0.1  lustadult.com
+ 127.0.0.1  lustadult.com #[server down?]
  # [Masterforex][AS48974][92.38.0.0 - 92.38.7.255]
++<<<<<<< HEAD
 +127.0.0.1  banner.33drugs.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Masterhost][AS25532][217.16.27.0 - 217.16.27.255]
  # [Masterhost / Mezon.ru][AS25532][83.222.7.128 - 83.222.7.159]
  # [Masterhost-hst][83.222.22.0 - 83.222.23.255]
@@@ -7888,7 -7860,6 +8164,10 @@@
  # [Mecuriuz / Mc Host.ru][AS6854][83.229.252.0 - 83.229.253.255]
  # [Mecuriuz / Mc Host.ru][84.252.148.0 - 84.252.149.255]
  # [Mecuriuz / Mc Host.ru][94.103.80.0 - 94.103.81.255]
++<<<<<<< HEAD
 +127.0.0.1  fasttraff.info #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Mecuriuz / McHost.Ru][AS48172][94.198.53.0 - 94.198.53.255]
  127.0.0.1  nahuja.ru
  # [Media Breakaway / OptinRealBig.com][AS32311][69.6.27.0 - 69.6.27.255]
@@@ -8041,7 -8012,6 +8320,10 @@@
  127.0.0.1  beacon.clickequations.net #[WebBug]
  127.0.0.1  js.clickequations.net #[w11.b.cap-mii.net]
  127.0.0.1  cachebanner.europacasino.com
++<<<<<<< HEAD
 +127.0.0.1  cserver.mii.instacontent.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  m.banner.linksynergy.com #[Tracking.Cookie]
  127.0.0.1  cachebanner.titanpoker.com
  127.0.0.1  creativeby1.unicast.com
@@@ -8074,10 -8044,9 +8356,14 @@@
  127.0.0.1  www.gallerytrafficservice.com
  127.0.0.1  clicks.globaltrafficservice.com
  127.0.0.1  feeds.globaltrafficservice.com #[Spamdexing]
++<<<<<<< HEAD
 +127.0.0.1  ads01.reventon.mobi
 +127.0.0.1  www.wtfmedia.com #[server down?]
++=======
+ 127.0.0.1  ads01.reventon.mobi #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [MojoHost / Easy Online Solutions][64.59.64.0 - 64.59.127.255]
- 127.0.0.1  serve.2ndads.com
+ 127.0.0.1  serve.2ndads.com #[server down?]
  127.0.0.1  www.chickenbanners.com
  127.0.0.1  popit.mediumpimpin.com
  # [MojoHost / Aw Telecom][AS27589][64.59.82.128 - 64.59.82.159]
@@@ -8177,7 -8146,6 +8463,10 @@@
  127.0.0.1  stats.xxxrewards.com
  127.0.0.1  www.cleanbrowser.com
  127.0.0.1  rewards.macandbumble.com
++<<<<<<< HEAD
 +127.0.0.1  naughtyads.naughtyamerica.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  secure6.platinumbucks.com
  127.0.0.1  banners.spacash.com
  127.0.0.1  banners2.spacash.com
@@@ -8250,11 -8221,15 +8542,22 @@@
  127.0.0.1  www.traffikcntr.com
  # [Net Access][207.210.64.0 - 207.210.127.255]
  # [Net Access][209.123.0.0 - 209.123.255.255]
++<<<<<<< HEAD
 +127.0.0.1  foundguide.com
++=======
+ # [Net Access][AS8001][50.116.0.0 - 50.116.63.255]
+ 127.0.0.1  lognormal.net
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Net Access][AS8001][64.21.0.0 - 64.21.191.255]
  # [Net Access][64.247.0.0 - 64.247.63.255]
  # [Net Access / Cdnetworks][AS8001][66.114.48.0 - 66.114.63.255]
  127.0.0.1  img.linkstorm.net
++<<<<<<< HEAD
++=======
+ # [Net Access][AS8001][66.175.208.0 - 66.175.223.255]
+ 127.0.0.1  204st.us
+ 127.0.0.1  ipv6.204st.us #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Net Access][AS8001][66.228.32.0 - 66.228.63.255]
  127.0.0.1  tracking.onespot.com
  # [Net Access / DomainSpa][AS8001][66.246.0.0 - 66.246.255.255]
@@@ -8288,7 -8263,6 +8591,10 @@@
  127.0.0.1  go.searchanyway.com
  127.0.0.1  www.searchanyway.com
  # [Netelligent / Gameserverz][67.212.64.0 - 67.212.95.255]
++<<<<<<< HEAD
 +127.0.0.1  sexojet.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [NetHolding][AS24730][81.173.64.0 - 81.173.64.255]
  127.0.0.1  adserver.geenstijl.nl
  127.0.0.1  kassa.geenstijl.nl
@@@ -8342,7 -8316,6 +8648,10 @@@
  127.0.0.1  www.netdirect.nl
  127.0.0.1  startpunt.nu.site-id.nl
  127.0.0.1  www.site-id.nl
++<<<<<<< HEAD
 +127.0.0.1  nbasic.sitestat.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Nedstat][AS42320][77.72.112.0 - 77.72.113.255]
  127.0.0.1  nedstat.nl
  127.0.0.1  www.nedstat.nl
@@@ -8562,7 -8537,6 +8873,10 @@@
  127.0.0.1  netspiderads2.indiatimes.com
  127.0.0.1  netspiderads3.indiatimes.com
  127.0.0.1  adsrv.iol.co.za
++<<<<<<< HEAD
 +127.0.0.1  adserv.it-analysis.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adserver1.journalregister.com
  127.0.0.1  kermit.macnn.com
  127.0.0.1  html.knbc.com #[Omniture]
@@@ -8588,7 -8562,6 +8902,10 @@@
  127.0.0.1  promos.newsok.com
  127.0.0.1  adserver2.news-journalonline.com
  127.0.0.1  ads.newsquest.co.uk #[RealMedia]
++<<<<<<< HEAD
 +127.0.0.1  adsadmin.newsquest.co.uk #[RealMedia][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  collector.newsx.cc
  127.0.0.1  ads.northjersey.com #[RealMedia]
  127.0.0.1  adserver.nydailynews.com #[RealMedia]
@@@ -8615,8 -8588,6 +8932,11 @@@
  127.0.0.1  ads.signonsandiego.com
  127.0.0.1  ads.space.com #[RealMedia]
  127.0.0.1  ads.sportingnews.com #[RealMedia]
++<<<<<<< HEAD
 +127.0.0.1  ads.standartnews.com #[server down?]
 +127.0.0.1  new.standartnews.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adlinks.startribune.com
  127.0.0.1  ads.stephensmedia.com
  127.0.0.1  adzone.stltoday.com
@@@ -10055,7 -10035,6 +10384,10 @@@
  127.0.0.1  metrics.crystalcruises.com
  127.0.0.1  metrics.csmonitor.com
  127.0.0.1  metrics.ctv.ca
++<<<<<<< HEAD
 +127.0.0.1  metric.current.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  metrics.dailystrength.org
  127.0.0.1  stats.dallasnews.com
  127.0.0.1  metrics.delias.com
@@@ -10744,7 -10724,6 +11077,10 @@@
  127.0.0.1  a.pokerplayermagazine.co.uk
  127.0.0.1  c.realtytrac.com
  127.0.0.1  a.shop.com
++<<<<<<< HEAD
 +127.0.0.1  t.sixflags.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  a.spicetv.com
  127.0.0.1  h.spill.com
  127.0.0.1  a.tempurpedic.com
@@@ -10825,10 -10804,10 +11161,17 @@@
  127.0.0.1  www.efficienttraffic.com
  127.0.0.1  adserver.magazyn.pl
  # [Ovh Sas][AS16276][188.165.192.0 - 188.165.255.255]
++<<<<<<< HEAD
 +127.0.0.1  serverfarm.adplans.info #[server down?]
 +127.0.0.1  openx.nagrzyby.pl
 +# [Ovh Sas][AS16276][192.95.0.0 - 192.95.63.255]
 +127.0.0.1  ad.asntown.net
++=======
+ 127.0.0.1  openx.nagrzyby.pl
+ # [Ovh Sas][AS16276][192.95.0.0 - 192.95.63.255]
+ 127.0.0.1  ad.asntown.net
+ 127.0.0.1  i.vemba.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Ovh Sas][198.27.64.0 - 198.27.127.255]
  127.0.0.1  webmarketing3x.net
  # [Ovh Sas][213.186.33.0 - 213.186.33.255]
@@@ -11149,7 -11126,6 +11491,10 @@@
  127.0.0.1  x.teenssites.net
  127.0.0.1  unisearch.name #[Spamdexing]
  127.0.0.1  content.unisearch.name
++<<<<<<< HEAD
 +127.0.0.1  usedstone.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Platinum eMedia / Marketing Extensions][AS40818][207.246.196.0 - 207.246.199.255]
  127.0.0.1  adshooter.com #[Adware.AdShooter][Wildcard DNS]
  127.0.0.1  dl.adshooter.com
@@@ -11498,7 -11477,6 +11846,10 @@@
  127.0.0.1  www.adfusion.com
  127.0.0.1  adreadytractions.com
  127.0.0.1  www.adversalservers.com
++<<<<<<< HEAD
 +127.0.0.1  ads.comicskingdom.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  bigapple.contextuads.com
  127.0.0.1  cowboy.contextuads.com
  127.0.0.1  loadus.exelator.com
@@@ -11636,8 -11614,6 +11987,11 @@@
  127.0.0.1  analytics.radiatemedia.com
  127.0.0.1  www.silver-path.com
  127.0.0.1  ad.where.com
++<<<<<<< HEAD
 +# [Rackvibe][AS14037][209.250.224.0 - 209.250.255.255]
 +# [Rackvibe][AS14037][64.18.128.0 - 64.18.159.255]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Rambler][AS24638][81.19.70.0 -  81.19.70.255]
  127.0.0.1  ad.rambler.ru #[WebBug]
  127.0.0.1  ad2.rambler.ru
@@@ -11727,13 -11701,6 +12079,16 @@@
  # [Righthosting.com][AS14576][67.220.140.0 - 67.220.141.255]
  127.0.0.1  ads.amateurmatch.com
  127.0.0.1  ads.datinggold.com
++<<<<<<< HEAD
 +# [Root Esolutions][AS5577][193.104.153.0 - 193.104.153.255]
 +# [Root Esolutions / Titan Ltd][AS5577][193.169.12.0 - 193.169.13.255]
 +# [Root Esolutions][AS44042][195.24.72.0 - 195.24.79.255]
 +# [Root Esolutions][AS44042][212.117.160.0 - 212.117.175.255]
 +127.0.0.1  medsearch007.com #[ScamFraudAlert.Pharmacy]
 +# [Root Esolutions / Artem Zhirkov][AS5577][91.212.226.0 - 91.212.226.255]
 +# [Root Esolutions / Altushost][AS44042][91.214.44.0 - 91.214.47.255]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [RTComm.ru / Joint Stock][AS8342][195.161.119.0 - 195.161.119.255]
  127.0.0.1  ad.bannerbank.ru
  127.0.0.1  ad1.bannerbank.ru
@@@ -12002,7 -11969,6 +12357,10 @@@
  127.0.0.1  www.intelli-direct.com #[WebBug]
  127.0.0.1  tags.transportdirect.info #[WebBug]
  # [Serveur-express-nerim][AS13193][80.65.232.0 - 80.65.232.255]
++<<<<<<< HEAD
 +127.0.0.1  stats.ref2000.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  cpc.trafiz.net
  127.0.0.1  t3.trafiz.net
  127.0.0.1  track.trafiz.net
@@@ -12181,8 -12145,7 +12537,12 @@@
  # [Softlayer][AS36351][173.192.0.0 - 173.193.255.255]
  127.0.0.1  d1.24counter.com
  127.0.0.1  www.admixxer.com
++<<<<<<< HEAD
 +127.0.0.1  cdn.angelfishstats.com
 +127.0.0.1  avastats.com #[server down?]
++=======
+ 127.0.0.1  cdn.angelfishstats.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  bestdigitalrewards.com
  127.0.0.1  bigbrandrewards.com
  127.0.0.1  c.chango.com
@@@ -12229,6 -12191,7 +12588,10 @@@
  127.0.0.1  zirve100.com
  # [Softlayer][AS36351][184.172.0.0 - 184.173.255.255]
  127.0.0.1  convusmp.admailtiser.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  adv.li
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  vap2iad2.lijit.com
  127.0.0.1  vap4iad2.lijit.com
  127.0.0.1  t.newscurve.com
@@@ -12240,7 -12203,6 +12603,10 @@@
  # [Softlayer / Future Hosting][AS36351][208.101.16.104 - 208.101.16.111]
  # [Softlayer][208.101.0.0 - 208.101.63.255]
  # [SoftLayer][AS36351][208.43.0.0 - 208.43.255.255]
++<<<<<<< HEAD
 +127.0.0.1  www.addbags.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  banners.adventory.com
  127.0.0.1  as.autoforums.com
  127.0.0.1  as2.autoforums.com
@@@ -12361,7 -12323,6 +12727,10 @@@
  127.0.0.1  www.sacredphoenix.com
  127.0.0.1  srv.sayyac.com
  127.0.0.1  srv.sayyac.net
++<<<<<<< HEAD
 +127.0.0.1  www.shinypics.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  superfastsservers.com #[Spamdexing]
  127.0.0.1  www.superfastsservers.com
  127.0.0.1  www.tangabilder.to
@@@ -12831,7 -12789,6 +13197,10 @@@
  127.0.0.1  www.truesuite.com #[TrueWatch]
  127.0.0.1  www.urpo.com
  127.0.0.1  www.worlds-best-online-casinos.com #[AdWare.Win32.Casino.w]
++<<<<<<< HEAD
 +127.0.0.1  xxx4live.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Theplanet.com][69.56.128.0 - 69.56.255.255]
  127.0.0.1  www.adultdatingtraffic.com
  127.0.0.1  counter.relmaxtop.com
@@@ -13069,7 -13024,6 +13436,10 @@@
  # [Todayhost / Bogal Ab][195.42.102.0 - 195.42.103.255]
  127.0.0.1  myincestclips.net
  127.0.0.1  www.myincestclips.net
++<<<<<<< HEAD
 +127.0.0.1  banners.paneuromedia.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  petsmovies.com
  127.0.0.1  zoomovies.org
  127.0.0.1  www.zoomovies.org
@@@ -13116,7 -13070,6 +13486,10 @@@
  127.0.0.1  jsp2.clickzzs.nl
  127.0.0.1  vip.clickzzs.nl
  127.0.0.1  vip2.clickzzs.nl
++<<<<<<< HEAD
 +127.0.0.1  a1.elekted.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Trueserver][87.233.141.0 - 87.233.228.255]
  127.0.0.1  a3.adzs.nl
  127.0.0.1  a4.adzs.nl
@@@ -14203,7 -14156,6 +14576,10 @@@
  127.0.0.1  link.maxxandmore.com #[Spamdexing]
  127.0.0.1  promo.passioncams.com
  127.0.0.1  banners.payserve.com
++<<<<<<< HEAD
 +127.0.0.1  banners.teeniemovies.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  secure.vxsbill.com #[MSM Pay bv]
  # [Virtumundo][AS36332][206.82.176.0 - 206.82.191.255]
  127.0.0.1  virtumundo.com #[Panda.Virtumonde.C]
@@@ -14698,10 -14636,7 +15060,11 @@@
  127.0.0.1  123ads.nl
  127.0.0.1  ad.123ads.nl
  127.0.0.1  statz.123ads.nl
- 127.0.0.1  search7info.com
- 127.0.0.1  www.stasga.com
  # [Worldstream][AS49981][94.100.26.0 - 94.100.27.255]
++<<<<<<< HEAD
 +127.0.0.1  buyonlineviagra.com #[ScamFraudAlert.Pharmacy]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [WPP Group via various]
  127.0.0.1  adcontent.videoegg.com
  127.0.0.1  core.videoegg.com
diff --cc data/someonewhocares.org/hosts
index ede592470,122265ac3..8c4bd14c4
--- a/data/someonewhocares.org/hosts
+++ b/data/someonewhocares.org/hosts
@@@ -6,7 -6,7 +6,11 @@@
  # Please forward any additions, corrections or comments by email to
  # hosts@someonewhocares.org
  
++<<<<<<< HEAD
 +# Last updated: Jun 3th, 2013 at 11:35
++=======
+ # Last updated: Jul 22nd, 2013 at 12:28
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  
  # Use this file to prevent your computer from connecting to selected
  # internet hosts. This is an easy and effective way to protect you from 
@@@ -5180,6 -5199,7 +5203,10 @@@ fe80::1%lo0     localhos
  127.0.0.1 cdn1.xlightmedia.com
  127.0.0.1 cdn2.adsdk.com
  127.0.0.1 cdn2.amateurmatch.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1 cdn2.emediate.eu
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1 cdn3.adexprts.com
  127.0.0.1 cdn3.telemetryverification.net
  127.0.0.1 cdn454.telemetryverification.net
diff --cc hosts
index 98263d83d,bae4da078..a295ba752
--- a/hosts
+++ b/hosts
@@@ -9,14 -9,13 +9,22 @@@
  #    someonewhocares.org
  #    StevenBlack
  #
++<<<<<<< HEAD
 +# Take Note:
 +# Merging these sources produced 2071 duplicates
++=======
+ # Merging these sources produced 22887 unique entries
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # ===============================================================
  
  # Begin malwaredomainlist.com
  #               MalwareDomainList.com Hosts List           #
  #   http://www.malwaredomainlist.com/hostslist/hosts.txt   #
++<<<<<<< HEAD
 +#         Last updated: Wed, 05 Jun 13 20:18:18 +0000      #
++=======
+ #         Last updated: Tue, 30 Jul 13 13:35:13 +0000      #
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  
  
  127.0.0.1  localhost
@@@ -281,6 -284,7 +293,10 @@@
  127.0.0.1  complainpaywall.net
  127.0.0.1  conds.ru
  127.0.0.1  config.shopperreports.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  conqueronline-co.91.com.tqpoint.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  cookingwithmarijuana.com
  127.0.0.1  costcopainlessly.org
  127.0.0.1  count.fuckunion.com
@@@ -406,6 -415,7 +427,10 @@@
  127.0.0.1  f-kotek.com
  127.0.0.1  facebook.churchblend.com
  127.0.0.1  famagatra.ru
++<<<<<<< HEAD
++=======
+ 127.0.0.1  fanning.homilybbk.in
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  faq-candrive.tk
  127.0.0.1  farishtech.com
  127.0.0.1  fars-rizan.com
@@@ -921,6 -941,7 +956,10 @@@
  127.0.0.1  soberthingingmon.com
  127.0.0.1  soberthingingmon.net
  127.0.0.1  socks.vpgconsulting.com.br
++<<<<<<< HEAD
++=======
+ 127.0.0.1  soft245.ru
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  softproworld.com
  127.0.0.1  softwarea-z.com
  127.0.0.1  solonmdr.xpg.com.br
@@@ -1195,6 -1225,7 +1243,10 @@@
  127.0.0.1  www.marlaktuell.de
  127.0.0.1  www.marques.pro.br
  127.0.0.1  www.masimpex.com.br
++<<<<<<< HEAD
++=======
+ 127.0.0.1  www.matteplanet.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.molesa.xpg.com.br
  127.0.0.1  www.mpsystem.it
  127.0.0.1  www.muzeeum.nl
@@@ -1308,7 -1342,7 +1363,11 @@@
  # This *must* be the first line: 127.0.0.1     localhost   #
  #                                                          #
  #**********************************************************#
++<<<<<<< HEAD
 +# ---------------- Updated: May-21-2013 ------------------ #
++=======
+ # ---------------- Updated: July-08-2013 ----------------- #
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  #**********************************************************#
  #                                                          #
  # Disclaimer: this file is free to use for personal use    #
@@@ -1397,7 -1435,6 +1460,10 @@@
  127.0.0.1  adhitzads.com
  127.0.0.1  ssl3.adhost.com
  127.0.0.1  www2.adhost.com
++<<<<<<< HEAD
 +127.0.0.1  mztag.ad-indicator.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adfarm1.adition.com
  127.0.0.1  imagesrv.adition.com
  127.0.0.1  ad.adition.net
@@@ -1550,8 -1588,6 +1617,11 @@@
  127.0.0.1  adv.adwish.net
  127.0.0.1  ads.adwitserver.com
  127.0.0.1  ad.adworx.at
++<<<<<<< HEAD
 +127.0.0.1  adxmarket.com #[server down?]
 +127.0.0.1  ad.adxmarket.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.ad-z.de
  127.0.0.1  ads.afa.net
  127.0.0.1  affelix.com
@@@ -1578,7 -1614,7 +1648,11 @@@
  127.0.0.1  ac.ajur.info #[WebBug]
  127.0.0.1  openx.ajur.info
  127.0.0.1  adlik2.akavita.com
++<<<<<<< HEAD
 +127.0.0.1  ads1.a-lehdet.fi
++=======
+ 127.0.0.1  ads1.a-lehdet.fi #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  log.aliiike.com
  127.0.0.1  ads.allaccess.com.ph
  127.0.0.1  adcontent2.allaccess.com.ph
@@@ -1629,6 -1666,7 +1704,10 @@@
  127.0.0.1  ads.associatedcontent.com
  127.0.0.1  atemda.com
  127.0.0.1  rules.atgsvcs.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  ads.atticamediagroup.gr
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.auctionads.com
  127.0.0.1  banners.audioholics.com
  127.0.0.1  ad.auditude.com
@@@ -1678,6 -1716,7 +1757,10 @@@
  127.0.0.1  stat.bdirect.ru
  127.0.0.1  ad.beepworld.de
  127.0.0.1  ads.be2hand.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  app.beanstalkdata.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.beead.co.uk
  127.0.0.1  tracker.beezup.com
  127.0.0.1  autocontext.begun.ru
@@@ -1764,7 -1800,6 +1844,10 @@@
  127.0.0.1  ads.btv.bg
  127.0.0.1  ads.buljobs.bg
  127.0.0.1  ivitrine.buscape.com
++<<<<<<< HEAD
 +127.0.0.1  vitrine.buscape.com.br #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.business.hr
  127.0.0.1  ads.businessclick.com
  127.0.0.1  ads.businessclick.pl
@@@ -1967,10 -2005,10 +2053,17 @@@
  127.0.0.1  ay.eastmoney.com
  127.0.0.1  www.easy-dating.org
  127.0.0.1  top.easy.lv
++<<<<<<< HEAD
 +127.0.0.1  easytrader.bg
 +127.0.0.1  ads.easytrader.bg
 +127.0.0.1  static.easytrader.bg
 +127.0.0.1  www.ebaneri.com #[server down?]
++=======
+ 127.0.0.1  web2.easyresearch.se
+ 127.0.0.1  easytrader.bg
+ 127.0.0.1  ads.easytrader.bg
+ 127.0.0.1  static.easytrader.bg
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.ebannertraffic.com
  127.0.0.1  ox.e-card.bg
  127.0.0.1  ox-s.e-card.bg
@@@ -2073,7 -2112,6 +2167,10 @@@
  127.0.0.1  error.fc2.com
  127.0.0.1  feedjit.com
  127.0.0.1  log.feedjit.com
++<<<<<<< HEAD
 +127.0.0.1  ads.fema-bg.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  analytics.femalefirst.co.uk
  127.0.0.1  pixel.fetchback.com
  127.0.0.1  banners.ffsbg.com
@@@ -2105,7 -2143,7 +2202,11 @@@
  127.0.0.1  forvideo.at
  127.0.0.1  ads.foxnews.com
  127.0.0.1  www.fpcclicks.com
++<<<<<<< HEAD
 +127.0.0.1  f-questionnaire.com
++=======
+ 127.0.0.1  f-questionnaire.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ad.freecity.de
  127.0.0.1  ads05.freecity.de
  127.0.0.1  maurobb.freecounter.it
@@@ -2138,7 -2176,6 +2239,10 @@@
  127.0.0.1  ads.gamelink.com
  127.0.0.1  ingameads.gameloft.com
  127.0.0.1  adv.gamerzhut.com
++<<<<<<< HEAD
 +127.0.0.1  www.gamersbanner.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.garga.biz
  127.0.0.1  ads.gather.com
  127.0.0.1  track.gawker.com #[WebBug]
@@@ -2182,7 -2219,6 +2286,10 @@@
  127.0.0.1  ad-incisive.grapeshot.co.uk
  127.0.0.1  reed-cw.grapeshot.co.uk
  127.0.0.1  adv.gratuito.st
++<<<<<<< HEAD
 +127.0.0.1  graq.ru #[ScamFraudAlert.Pharmacy][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  rma-api.gravity.com
  127.0.0.1  www.greasypalm.co.uk #[PcTools.GreasyPalm bar]
  127.0.0.1  adserver.gruprc.ro
@@@ -2349,6 -2385,7 +2456,10 @@@
  127.0.0.1  ilead.itrack.it
  127.0.0.1  adserver.itsfogo.com
  127.0.0.1  partnerfeed.itsfogo.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  stats.itweb.co.za
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  link.ixs1.net #[WebBug]
  # [J]
  127.0.0.1  ad.jamba.de
@@@ -2550,7 -2589,6 +2663,10 @@@
  127.0.0.1  adserver.gb3.motorpresse.de
  127.0.0.1  ads.mp3-online.com.ua
  127.0.0.1  www1.mpnrs.com
++<<<<<<< HEAD
 +127.0.0.1  www.ads.mrejata.net
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  msgtag.com #[Email tracker]
  127.0.0.1  img.msgtag.com
  127.0.0.1  www.msgtag.com
@@@ -2627,7 -2665,6 +2743,10 @@@
  127.0.0.1  rbk.netmng.com
  127.0.0.1  www.netmaxx.com
  127.0.0.1  ads.netrition.com
++<<<<<<< HEAD
 +127.0.0.1  servedby.netshelter.net #[Tracking.Cookie][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adserver.networkvision.net
  127.0.0.1  ads.neudesicmediagroup.com
  127.0.0.1  ads.newdream.net
@@@ -2649,7 -2686,7 +2768,11 @@@
  127.0.0.1  www2.nicheseek.com
  127.0.0.1  adserve5.nikkeibp.co.jp
  127.0.0.1  bizad.nikkeibp.co.jp
++<<<<<<< HEAD
 +127.0.0.1  feed4a.nixxie.com
++=======
+ 127.0.0.1  feed4a.nixxie.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.nlbanner.nl
  127.0.0.1  banner.nonstoppartner.de
  127.0.0.1  counter.nope.dk
@@@ -2898,7 -2944,6 +3030,10 @@@
  127.0.0.1  p.rfihub.com
  127.0.0.1  richmedia247.com
  127.0.0.1  overlay.ringtonematcher.com
++<<<<<<< HEAD
 +127.0.0.1  tracking.ringtonematcher.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  db.riskwaters.com #[WebTrends]
  127.0.0.1  rightstats.com
  127.0.0.1  www.rightstats.com
@@@ -3001,7 -3046,6 +3136,10 @@@
  127.0.0.1  l.socialsexnetwork.net
  127.0.0.1  a.softconsultgroup.com
  127.0.0.1  pub.softonic.com
++<<<<<<< HEAD
 +127.0.0.1  www.software4yoursuccess.com #[Froggie Scan]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  sacdcad02.salon.com
  127.0.0.1  tenbux.somethingawful.com
  127.0.0.1  ivox.socratos.net
@@@ -3022,7 -3066,6 +3160,10 @@@
  127.0.0.1  sitestat3.sport1.de
  127.0.0.1  www.speedcounter.net
  127.0.0.1  www.sptag.com #[WebBug]
++<<<<<<< HEAD
 +127.0.0.1  www.spybot-spyware-removal.com #[palsol.com][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  springclick.com
  127.0.0.1  www.spywareit.com
  127.0.0.1  www.spywarekiller.net #[Rogue/Suspect]
@@@ -3047,7 -3090,6 +3188,10 @@@
  127.0.0.1  ads001.stickam.com
  127.0.0.1  t1.stormiq.com
  127.0.0.1  analytics.strangeloopnetworks.com
++<<<<<<< HEAD
 +127.0.0.1  ads.streetfire.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  gsorder.berlin.strato.de
  127.0.0.1  adv.stznews.bg
  127.0.0.1  www.sublimemedia.net
@@@ -3099,12 -3141,10 +3243,18 @@@
  127.0.0.1  members.popup.tbn.ru
  127.0.0.1  traffic.tcmagnet.com
  127.0.0.1  oa.techcrunch.com
++<<<<<<< HEAD
 +127.0.0.1  www.tekeffect.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adv.technews.bg
  127.0.0.1  ads.tele.net
  127.0.0.1  adserver.tele.net
  127.0.0.1  sdc.tele.net
++<<<<<<< HEAD
 +127.0.0.1  adserver.teracent.net #[Tracking.Cookie][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  banner.terminal.hu
  127.0.0.1  stf.terra.com.br
  127.0.0.1  ad.terra.com.mx
@@@ -3236,7 -3276,7 +3386,11 @@@
  127.0.0.1  adclient1.tucows.com
  127.0.0.1  counts.tucows.com
  127.0.0.1  google.tucows.com
++<<<<<<< HEAD
 +127.0.0.1  adextensioncontrol.tudou.com
++=======
+ 127.0.0.1  adextensioncontrol.tudou.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  stats.tunt.lv
  127.0.0.1  d.turn.com
  127.0.0.1  ad.tv2.no #[RealMedia]
@@@ -3489,6 -3530,7 +3644,10 @@@
  127.0.0.1  ad.yourmedia.com
  127.0.0.1  ad1.yourmedia.com
  127.0.0.1  ad.yoyo.pl
++<<<<<<< HEAD
++=======
+ 127.0.0.1  pc2.yumenetworks.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Z]
  127.0.0.1  ads.zamunda.net
  127.0.0.1  ad.zanox.com
@@@ -3593,7 -3635,6 +3752,10 @@@
  127.0.0.1  adverts.trojanpublishing.net
  # [1-800-hosting][AS33210][69.41.160.0 - 69.41.191.255]
  127.0.0.1  www.clickog.com
++<<<<<<< HEAD
 +127.0.0.1  www.jadesearch.net
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.ineedhits.com
  127.0.0.1  track.lativio.com
  127.0.0.1  track2.me
@@@ -3949,7 -3990,6 +4111,10 @@@
  127.0.0.1  analytics.admob.com
  127.0.0.1  jp.admob.com
  127.0.0.1  p.admob.com #[Mobile.Advertising]
++<<<<<<< HEAD
 +127.0.0.1  r.admob.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Admob][AS22577][70.32.128.0 - 70.32.159.255]
  127.0.0.1  mm.admob.com
  127.0.0.1  mm1.vip.sc1.admob.com
@@@ -4061,7 -4099,6 +4224,10 @@@
  127.0.0.1  searchnowqa.com
  # [Advancedhosters / LeaseWeb][AS39572][88.208.0.0 - 88.208.11.255]
  127.0.0.1  st.pc.adonweb.ru
++<<<<<<< HEAD
 +127.0.0.1  adulttraffic.ru #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  admin.amateurgalls.com
  127.0.0.1  jps.ru
  127.0.0.1  www.jps.ru #[adslim.com]
@@@ -4070,7 -4107,6 +4236,10 @@@
  127.0.0.1  a3.mediagra.com
  127.0.0.1  a4.mediagra.com
  127.0.0.1  a5.mediagra.com
++<<<<<<< HEAD
 +127.0.0.1  mytraff.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  st.pay-click.ru
  127.0.0.1  rb-net.com
  127.0.0.1  ads.xhamster.com
@@@ -4144,6 -4180,8 +4313,11 @@@
  127.0.0.1  videodetectivenetwork.valuead.com
  127.0.0.1  vdn.valuead.com
  127.0.0.1  yahooads.valuead.com
++<<<<<<< HEAD
++=======
+ # [Akamai][AS20940][125.56.128.0 - 125.56.255.255]
+ 127.0.0.1  cdn-static.liverail.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Akamai / NTT][AS2914][AS26769][184.24.0.0 - 184.31.255.255]
  127.0.0.1  www.77tracking.com
  127.0.0.1  ak1s.abmr.net
@@@ -4248,7 -4286,7 +4422,11 @@@
  127.0.0.1  ad2.turn.com
  127.0.0.1  urls.api.twitter.com
  127.0.0.1  media-0.vpptechnologies.com
++<<<<<<< HEAD
 +# [Akamai][AS20940][96.16.0.0 - 96.17.255.255]
++=======
+ # [Akamai][AS20940][AS12989][96.16.0.0 - 96.17.255.255]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  a.adroll.com
  127.0.0.1  content.budsinc.com
  127.0.0.1  cts.channelintelligence.com #[switch.atdmt.com]
@@@ -4355,8 -4394,6 +4534,11 @@@
  127.0.0.1  http-logs.loggly.com
  127.0.0.1  logs.loggly.com #[WebBug]
  127.0.0.1  cmi.netseer.com
++<<<<<<< HEAD
 +127.0.0.1  brocade.netshelter.net
 +127.0.0.1  track.prd1.netshelter.net
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  log3.optimizely.com
  127.0.0.1  config.parsely.com
  127.0.0.1  pinion.gg
@@@ -4369,8 -4406,7 +4551,12 @@@
  127.0.0.1  mail.pinion.gg
  127.0.0.1  motd.pinion.gg #[Game Adverts]
  127.0.0.1  pog.gg
++<<<<<<< HEAD
 +127.0.0.1  pog.pinion.gg
 +127.0.0.1  stage.pinion.gg #[server down?]
++=======
+ 127.0.0.1  pog.pinion.gg #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  tix.pinion.gg
  127.0.0.1  video.pinion.gg
  127.0.0.1  wiki.pinion.gg
@@@ -4419,7 -4455,6 +4605,10 @@@
  127.0.0.1  a.lingospot.com #[WebBug]
  127.0.0.1  ads.mobclix.com
  127.0.0.1  s.mobclix.com
++<<<<<<< HEAD
 +127.0.0.1  adv.netshelter.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  a1.opentracker.net
  127.0.0.1  indium.openx.net
  127.0.0.1  cid.pardot.com
@@@ -4460,7 -4498,11 +4652,14 @@@
  127.0.0.1  dni.agcdn.com
  127.0.0.1  t13.intelliad.de
  127.0.0.1  t23.intelliad.de
+ 127.0.0.1  tracker.vinsight.de
  # [Amazon.com][AS16509][178.236.0.0 - 178.236.7.255]
++<<<<<<< HEAD
++=======
+ # [Amazon.com][AS16509][184.169.128.0 - 184.169.255.255]
+ 127.0.0.1  rainbow-us.mythings.com
+ 127.0.0.1  rainbow-geo-p.mythings.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Amazon.com][AS14618][184.72.0.0 - 184.73.255.255]
  127.0.0.1  ad.adanglers.com
  127.0.0.1  ads.adhub.co.nz
@@@ -4474,7 -4516,6 +4673,10 @@@
  127.0.0.1  ads.investingchannel.com
  127.0.0.1  o1.inviziads.com
  127.0.0.1  tracker.issuu.com
++<<<<<<< HEAD
 +127.0.0.1  pixel.klout.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  r.openx.net
  127.0.0.1  clicks.pureleads.com
  127.0.0.1  technologyreview.qwobl.net
@@@ -4526,6 -4567,7 +4728,10 @@@
  127.0.0.1  assets.luminate.com
  127.0.0.1  static.luminate.com
  127.0.0.1  content.mkt922.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  t.neodatagroup.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  track.netshelter.net
  127.0.0.1  static.parsely.com
  127.0.0.1  adimg.pixazza.com
@@@ -4638,14 -4681,22 +4845,31 @@@
  127.0.0.1  www.wtp101.com
  127.0.0.1  zdbb.net
  # [Amazon.com][AS16509][54.224.0.0 - 54.239.255.255]
++<<<<<<< HEAD
++127.0.0.1  beam.hlserve.com
++=======
+ 127.0.0.1  t.beanstalkdata.com
+ 127.0.0.1  hj.flxpxl.com
  127.0.0.1  beam.hlserve.com
+ 127.0.0.1  cdn.ip.inpwrd.com
+ 127.0.0.1  cdn.libraries.inpwrd.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  stat.komoona.com
  # [Amazon.com][AS16509][54.240.0.0 - 54.255.255.255]
  127.0.0.1  ads.adiply.com
  127.0.0.1  srv.admailtiser.com
  127.0.0.1  cdn.adual.net
++<<<<<<< HEAD
 +127.0.0.1  blockmetrics.com
 +127.0.0.1  tc-s.convertro.com
++=======
+ 127.0.0.1  serve.bannersdontwork.com
+ 127.0.0.1  blockmetrics.com
+ 127.0.0.1  engine.carbonads.com
+ 127.0.0.1  static.carbonads.com
+ 127.0.0.1  tc-s.convertro.com
+ 127.0.0.1  track.customer.io
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  error.demdex.net
  127.0.0.1  gannett.demdex.net
  127.0.0.1  cf.effectivemeasure.net
@@@ -4657,12 -4708,14 +4881,20 @@@
  127.0.0.1  banners.gossipcenter.com
  127.0.0.1  ads.groupcommerce.com
  127.0.0.1  adserv.impactengine.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  adn.impactradius.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  scripts.kissmetrics.com
  127.0.0.1  ads.lanistaads.com
  127.0.0.1  engine.marketfly.net
  127.0.0.1  content.mkt51.net
  127.0.0.1  content.mkt941.com
  127.0.0.1  tracker.mozo.com.au
++<<<<<<< HEAD
++=======
+ 127.0.0.1  static.nectarads.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ortc-ws2.realtime.co
  127.0.0.1  ortc-ws2-useast1-S0005.realtime.co
  127.0.0.1  admp-tc.sanoma.fi
@@@ -5002,14 -5055,14 +5234,24 @@@
  127.0.0.1  secure-id.impressiondesk.com
  127.0.0.1  ad.netcommunities.com
  127.0.0.1  ads.networkhm.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  ads.pubsqrd.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.sonobi.com
  127.0.0.1  ads.suite6ixty6ix.com
  127.0.0.1  ads.vntsm.com
  127.0.0.1  an.z5x.net
++<<<<<<< HEAD
 +# [Appserve Technologies][AS23376][64.241.102.160 - 64.241.102.191]
 +127.0.0.1  aries-search.com
 +# [Appserve Technologies][AS23376][66.101.58.0 - 66.101.58.255]
 +# [Argeweb Network][AS8315][193.34.150.0 - 193.34.151.255]
++=======
+ # [Appserve][AS23376][64.241.102.160 - 64.241.102.191]
+ # [Appserve][AS23376][66.101.58.0 - 66.101.58.255]
+ # [Argeweb][AS8315][193.34.150.0 - 193.34.151.255]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  b.ds1.nl
  127.0.0.1  k1s.nl #[Daisycon]
  127.0.0.1  affiliates.kliks.nl
@@@ -5212,7 -5266,6 +5455,10 @@@
  127.0.0.1  update.smart-browser.com
  127.0.0.1  www.smart-browser.com #[Adware.SmartBrowser]
  # [Bezeq][AS8551][62.219.49.0 - 62.219.50.255]
++<<<<<<< HEAD
 +127.0.0.1  banners.acw-digital.info #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Bezeq][AS8551][81.218.31.128 - 81.218.31.255]
  127.0.0.1  creative.xtendmedia.com
  # [Bezeq][AS8551][82.80.204.0 - 82.80.239.255]
@@@ -5394,7 -5446,7 +5639,11 @@@
  127.0.0.1  www6.burstnet.com
  127.0.0.1  www.burstnet.akadns.net
  # [BurstNet][AS21788][173.212.192.0 - 173.212.255.255]
++<<<<<<< HEAD
 +127.0.0.1  disco.flashbannernow.com #[server down?]
++=======
+ 127.0.0.1  disco.flashbannernow.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.quantcheck.com
  # [BurstNet][AS21788][184.82.0.0 - 184.82.255.255]
  127.0.0.1  www.adserv8.com
@@@ -5435,7 -5487,6 +5684,10 @@@
  127.0.0.1  engine.phn.doublepimp.com
  127.0.0.1  cdn.engine.phn.doublepimp.com
  127.0.0.1  streamate.doublepimp.com
++<<<<<<< HEAD
 +127.0.0.1  ads.parkedskins.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  rts.pgmediaserve.com
  127.0.0.1  rts.revfusion.net
  # [Calpop.com / Airlinereservations.com][AS7796][208.70.72.0 - 208.70.79.255]
@@@ -5991,9 -6041,7 +6242,13 @@@
  127.0.0.1  ads2.playnet.com
  127.0.0.1  as5000.wunderground.com
  # [Colo4dallas][AS30496][206.123.64.0 - 206.123.127.255]
++<<<<<<< HEAD
 +127.0.0.1  efp.ns3.bidsystem.com #[Adknowledge][server down?]
  127.0.0.1  pda.mv.bidsystem.com
 +127.0.0.1  us01.xmlsearch.findwhat.com #[server down?]
++=======
++127.0.0.1  pda.mv.bidsystem.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Colo4dallas][AS30496][67.222.133.86 - 67.222.133.93]
  127.0.0.1  imgc.psychcentral.com
  # [Coloc8][AS33536][64.128.87.0 - 64.128.87.255]
@@@ -6594,7 -6644,6 +6851,10 @@@
  127.0.0.1  server.iad.liveperson.net
  # [Euroaccess][AS34305][193.138.220.0 - 193.138.231.255]
  127.0.0.1  www.hostedbanners.com
++<<<<<<< HEAD
 +127.0.0.1  banner.sextorrent.to #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  landingpages.sunnytoolz.com
  # [Euroaccess][AS34305][85.12.0.0 - 85.12.63.255]
  127.0.0.1  ads.guru3d.com
@@@ -6628,7 -6674,6 +6885,10 @@@
  127.0.0.1  ad7.literotica.com
  # [Ezzi.net][66.199.224.0 - 66.199.255.255]
  # [Ezzi.net][AS15149][72.9.96.0 - 72.9.111.255]
++<<<<<<< HEAD
 +127.0.0.1  klikcentral.com #[ScamFraudAlert.Pharmacy]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Facebook]
  127.0.0.1  ads.ak.facebook.com
  127.0.0.1  creative.ak.facebook.com
@@@ -6672,7 -6717,6 +6932,10 @@@
  # [Fdcservers.net][74.63.64.0 - 74.63.95.255]
  127.0.0.1  www.1freecounter.com
  # [Fdcservers.net][76.73.0.0 - 76.73.127.255]
++<<<<<<< HEAD
 +127.0.0.1  secure.33drugs.com #[ScamFraudAlert.Pharmacy][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  jizzads.com
  127.0.0.1  www.jizzads.com
  # [Fedora-Hosting][88.85.81.0 - 88.85.81.255]
@@@ -6869,7 -6913,7 +7132,11 @@@
  127.0.0.1  ads.sxx.com
  127.0.0.1  ads.vipcams.com
  # [Gandi][AS29169][95.142.160.0 - 95.142.167.255]
++<<<<<<< HEAD
 +127.0.0.1  stats.mondespersistants.com
++=======
+ 127.0.0.1  stats.mondespersistants.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [GeMius]
  127.0.0.1  hit.gemius.pl #[Tracking.Cookie]
  127.0.0.1  activeby.hit.gemius.pl
@@@ -7153,7 -7196,7 +7419,11 @@@
  127.0.0.1  www.codeads.com
  127.0.0.1  14.ca.enwebsearch.com
  127.0.0.1  www.ewebse.com
++<<<<<<< HEAD
 +127.0.0.1  www.freehitwebsitecounter.com
++=======
+ 127.0.0.1  www.freehitwebsitecounter.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.freehitwebcounters.com
  127.0.0.1  www.milesdebanners.com
  127.0.0.1  redemptionengine.com #[SiteAdvisor.redemptionengine.com]
@@@ -7170,8 -7213,6 +7440,10 @@@
  # [Godaddy.com / Aster Edward Umali][Azter Inc][68.178.128.0 - 68.178.255.255]
  127.0.0.1  www.azter.com #[SiteAdvisor.azter.com]
  127.0.0.1  www.bestsexycelebs.com
++<<<<<<< HEAD
 +127.0.0.1  www.hunkymalecelebs.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  sexybabesx.com #[Win32/TrojanDownloader.Adload.NBH]
  127.0.0.1  adrianalima.sexybabesx.com
  127.0.0.1  aliciakeys.sexybabesx.com #[AdWare.Win32.WinAD.bv]
@@@ -7322,6 -7363,7 +7594,10 @@@
  127.0.0.1  www.appliedsemantics.com
  127.0.0.1  service.urchin.com #[Urchin Tracking Module]
  # [Google][AS15169][108.170.192.0 - 108.170.255.255]
++<<<<<<< HEAD
++=======
+ 127.0.0.1  bec.px.invitemedia.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  conversion-pixel.invitemedia.com
  # [Google / DoubleClick][AS15169][173.194.0.0 - 173.194.255.255]
  127.0.0.1  dp.g.doubleclick.net
@@@ -7464,7 -7506,6 +7740,10 @@@
  # [GTS Nextra / PrimeInteractive][AS5578][85.248.229.0 - 85.248.229.255]
  127.0.0.1  ad.sitelement.sk
  # [Hanaro Telecom][AS9318][114.200.0.0 - 114.207.255.255]
++<<<<<<< HEAD
 +127.0.0.1  ad.nsonmedia.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Hetzner][AS24940][144.76.0.0 - 144.76.255.255]
  127.0.0.1  c.am11.ru
  # [Hetzner][AS24940][176.9.0.0 - 176.9.255.255]
@@@ -7472,6 -7513,7 +7751,10 @@@
  127.0.0.1  advertising.fussball-liveticker.eu
  127.0.0.1  adv.medicine.bg
  127.0.0.1  e.mouseflow.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  mp.pianomedia.eu
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  app3.rutarget.ru
  127.0.0.1  adserver.spritmonitor.de
  127.0.0.1  trafficconverter.in
@@@ -7646,14 -7687,12 +7928,20 @@@
  127.0.0.1  ads.blitz.bg
  127.0.0.1  ads-bg.net
  127.0.0.1  ads.den.bg
++<<<<<<< HEAD
 +127.0.0.1  ads.foxtv.bg #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  b.grabo.bg
  127.0.0.1  ads.hobyto.com
  127.0.0.1  ads.popfolkstars.com
  127.0.0.1  ad.sbb.bg
  127.0.0.1  reklama.wisdom.bg
  # [HostDime.com][AS33182][66.7.192.0 - 66.7.223.255]
++<<<<<<< HEAD
 +127.0.0.1  www.conficker.name #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.dancingsnakegames.com
  127.0.0.1  www.disable-uac.com
  127.0.0.1  www.money4ads.com
@@@ -7757,7 -7790,6 +8039,10 @@@
  127.0.0.1  a.ads.t-online.de #[AdSolution-Website-Tag]
  127.0.0.1  admin.ads.t-online.de
  127.0.0.1  s.ads.t-online.de
++<<<<<<< HEAD
 +127.0.0.1  a.banner.t-online.de #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  count.passul.t-online.de
  # [Hungarian Telecom / T-online][80.150.6.0 - 80.150.7.255]
  127.0.0.1  homepage.t-online.de
@@@ -7816,7 -7848,6 +8101,10 @@@
  127.0.0.1  ads.ips7.bg
  127.0.0.1  ads.mixbg.net
  127.0.0.1  mvmads.com
++<<<<<<< HEAD
 +127.0.0.1  banners.novfolk.bg #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ads.petvet.bg
  127.0.0.1  advert.technews.bg
  127.0.0.1  ad.thesimplecomplex.bg
@@@ -7897,6 -7928,7 +8185,10 @@@
  127.0.0.1  g-f5fun.count.brat-online.ro
  127.0.0.1  g-f5news.count.brat-online.ro
  127.0.0.1  g-protv.count.brat-online.ro
++<<<<<<< HEAD
++=======
+ 127.0.0.1  hotnews.count.brat-online.ro
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  profm.count.brat-online.ro
  127.0.0.1  mtv.count.brat-online.ro
  127.0.0.1  myvideo.count.brat-online.ro
@@@ -7944,16 -7976,12 +8236,22 @@@
  127.0.0.1  internetfuel.searchcentrix.com
  127.0.0.1  www.searchcentrix.com #[VisiCom.SearchCentric]
  # [Inflow / myGeek.com][66.179.234.160 - 66.179.234.191]
++<<<<<<< HEAD
 +127.0.0.1  adonlist.com #[server down?]
 +127.0.0.1  adonlistings.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  context.adontext.com
  127.0.0.1  context2.adontext.com
  127.0.0.1  banner.adtrgt.com
  127.0.0.1  popunder.adtrgt.com
  127.0.0.1  transition.adtrgt.com
  127.0.0.1  url.adtrgt.com
++<<<<<<< HEAD
 +127.0.0.1  ad.cpvfeed.com #[SiteAdvisor.cpvfeed.com]
 +127.0.0.1  keyword.cpvfeed.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  offeroptimizer.mygeek.com
  127.0.0.1  searchhippo.mygeek.com
  127.0.0.1  webalize.mygeek.com
@@@ -8111,11 -8136,8 +8406,16 @@@
  127.0.0.1  p.chango.com
  127.0.0.1  lfov.net
  # [Internap / Namemedia][AS14742][64.95.64.0 - 64.95.64.255]
++<<<<<<< HEAD
 +127.0.0.1  bannerx.seeq.com #[server down?]
 +127.0.0.1  smds.seeq.com #[server down?]
 +127.0.0.1  adserver.sitesense.com #[Parking Service]
 +# [Internap][AS10913][66.150.0.0 - 66.151.255.255]
 +127.0.0.1  int.teracent.net #[server down?]
++=======
+ 127.0.0.1  adserver.sitesense.com #[Parking Service]
+ # [Internap][AS10913][66.150.0.0 - 66.151.255.255]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  cdn.visiblemeasures.com
  # [Internap / Pinball][AS14744][64.94.137.0 - 64.94.137.127]
  127.0.0.1  partners.clickpotato.com
@@@ -8157,7 -8179,6 +8457,10 @@@
  127.0.0.1  papaeagle.powered-by.seekmo.com
  127.0.0.1  pokemonpictures.powered-by.seekmo.com
  127.0.0.1  xfreelesbianmovies.powered-by.seekmo.com
++<<<<<<< HEAD
 +127.0.0.1  ad.ytsa.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  gec.zango.com
  # [Internap / Webhosting][AS12180][67.215.160.0 - 67.215.191.255]
  127.0.0.1  affiliate.trk4.com
@@@ -8220,7 -8242,6 +8524,10 @@@
  127.0.0.1  js.revsci.net
  127.0.0.1  jsl.revsci.net
  127.0.0.1  pix01.revsci.net #[TrackingPixelCode]
++<<<<<<< HEAD
 +127.0.0.1  pix02.revsci.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  pix03.revsci.net
  127.0.0.1  pix04.revsci.net
  127.0.0.1  revsci.tvguide.com
@@@ -8361,7 -8377,6 +8663,10 @@@
  127.0.0.1  www.singlesadnetwork.com
  127.0.0.1  mf.sitescout.com
  127.0.0.1  reboot.sitescout.com
++<<<<<<< HEAD
 +127.0.0.1  sorento.sitescout.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  vom.sitescout.com
  127.0.0.1  wam-ads.sitescout.com
  # [Isprime][66.230.128.0 - 66.230.191.255]
@@@ -8410,6 -8425,7 +8715,10 @@@
  127.0.0.1  tracking.craktraffic.com
  127.0.0.1  urchin.craktraffic.com
  127.0.0.1  www.elitedollars.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  free.fuckbook.cm
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  webmasters.h2porn.com
  127.0.0.1  ads.nudereviews.com
  127.0.0.1  www.oainternet.com
@@@ -8618,14 -8635,13 +8928,21 @@@
  127.0.0.1  internetserviceteam.com
  127.0.0.1  www.little-help.com
  # [Leaseweb][AS28753][37.1.216.0 - 37.1.223.255]
++<<<<<<< HEAD
 +127.0.0.1  counter.finemedia.net
++=======
+ 127.0.0.1  counter.finemedia.net #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Leaseweb][AS16265][46.243.0.0 - 46.243.7.255]
  127.0.0.1  www.awmads.com
  127.0.0.1  vktr073.net
  # [Leaseweb][AS16265][62.212.66.0 - 62.212.84.255]
  127.0.0.1  ads.adhood.com
  # [Leaseweb][82.192.69.0 - 82.192.88.127]
++<<<<<<< HEAD
 +127.0.0.1  openads.adjoema.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  img.clicksagent.com
  127.0.0.1  rubanners.com #[clicksagent.com]
  127.0.0.1  f18.static.fcdnx.com
@@@ -8642,13 -8658,12 +8959,20 @@@
  # [Leaseweb][AS16265][85.17.111.0 - 85.17.94.255]
  127.0.0.1  3animalsex.com
  127.0.0.1  www.3animalsex.com
++<<<<<<< HEAD
 +127.0.0.1  rpc.adclickjunky.net
++=======
+ 127.0.0.1  rpc.adclickjunky.net #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.adcode.ws
  127.0.0.1  a.adorika.net
  127.0.0.1  adv.adultpartnership.com
  127.0.0.1  counter.cam-content.com
  127.0.0.1  piwik.cam-content.com #[Piwik.Analytics]
++<<<<<<< HEAD
 +127.0.0.1  click.cheapestpriceviagra.com #[ScamFraudAlert.Pharmacy]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.crackserver.com #[StopBadware.Report]
  127.0.0.1  www.dbobs.com #[Spamdexing]
  127.0.0.1  ads2.ero-advertising.com
@@@ -8692,11 -8706,7 +9015,11 @@@
  127.0.0.1  counter.xeanon.com
  # [Leaseweb / Kolido.net][91.184.48.0 - 91.184.55.191]
  127.0.0.1  www.porncash.de
++<<<<<<< HEAD
 +127.0.0.1  ads.porncash.tv #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  www.porncash.tv
- 127.0.0.1  www.porndad.com
  # [Leaseweb][91.191.160.0 - 91.191.167.255]
  127.0.0.1  ads.kampanyatakip.net
  # [Leaseweb][94.75.198.0 - 94.75.198.255]
@@@ -8733,7 -8743,6 +9056,10 @@@
  127.0.0.1  s6.lebenna.com
  127.0.0.1  linktarget.com
  127.0.0.1  lw.lnkworld.com
++<<<<<<< HEAD
 +127.0.0.1  loltraf.ru #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  outtds.com
  127.0.0.1  cdn3.refusemedia.net
  127.0.0.1  adv.rockstar.bg
@@@ -9021,7 -9029,6 +9346,10 @@@
  127.0.0.1  adds.misiamoiatdom.com
  127.0.0.1  ad.moreto.net
  127.0.0.1  ads2.mystyle.bg
++<<<<<<< HEAD
 +127.0.0.1  adv.mytech.bg #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  ad.onmedia.bg
  127.0.0.1  ads.ngm.bg
  127.0.0.1  ads.proyavi.bg
@@@ -9135,7 -9142,6 +9463,10 @@@
  127.0.0.1  shared.juicybucks.com
  # [Master / Fast Internet][89.185.234.0 - 89.185.234.255]
  # [Masterforex][AS48974][92.38.0.0 - 92.38.7.255]
++<<<<<<< HEAD
 +127.0.0.1  banner.33drugs.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Masterhost][AS25532][217.16.27.0 - 217.16.27.255]
  # [Masterhost / Mezon.ru][AS25532][83.222.7.128 - 83.222.7.159]
  # [Masterhost-hst][83.222.22.0 - 83.222.23.255]
@@@ -9186,7 -9192,6 +9517,10 @@@
  # [Mecuriuz / Mc Host.ru][AS6854][83.229.252.0 - 83.229.253.255]
  # [Mecuriuz / Mc Host.ru][84.252.148.0 - 84.252.149.255]
  # [Mecuriuz / Mc Host.ru][94.103.80.0 - 94.103.81.255]
++<<<<<<< HEAD
 +127.0.0.1  fasttraff.info #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Mecuriuz / McHost.Ru][AS48172][94.198.53.0 - 94.198.53.255]
  127.0.0.1  nahuja.ru
  # [Media Breakaway / OptinRealBig.com][AS32311][69.6.27.0 - 69.6.27.255]
@@@ -9339,7 -9344,6 +9673,10 @@@
  127.0.0.1  beacon.clickequations.net #[WebBug]
  127.0.0.1  js.clickequations.net #[w11.b.cap-mii.net]
  127.0.0.1  cachebanner.europacasino.com
++<<<<<<< HEAD
 +127.0.0.1  cserver.mii.instacontent.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  m.banner.linksynergy.com #[Tracking.Cookie]
  127.0.0.1  cachebanner.titanpoker.com
  127.0.0.1  creativeby1.unicast.com
@@@ -9372,10 -9376,9 +9709,14 @@@
  127.0.0.1  www.gallerytrafficservice.com
  127.0.0.1  clicks.globaltrafficservice.com
  127.0.0.1  feeds.globaltrafficservice.com #[Spamdexing]
++<<<<<<< HEAD
 +127.0.0.1  ads01.reventon.mobi
 +127.0.0.1  www.wtfmedia.com #[server down?]
++=======
+ 127.0.0.1  ads01.reventon.mobi #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [MojoHost / Easy Online Solutions][64.59.64.0 - 64.59.127.255]
- 127.0.0.1  serve.2ndads.com
+ 127.0.0.1  serve.2ndads.com #[server down?]
  127.0.0.1  www.chickenbanners.com
  127.0.0.1  popit.mediumpimpin.com
  # [MojoHost / Aw Telecom][AS27589][64.59.82.128 - 64.59.82.159]
@@@ -9475,7 -9478,6 +9816,10 @@@
  127.0.0.1  stats.xxxrewards.com
  127.0.0.1  www.cleanbrowser.com
  127.0.0.1  rewards.macandbumble.com
++<<<<<<< HEAD
 +127.0.0.1  naughtyads.naughtyamerica.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  secure6.platinumbucks.com
  127.0.0.1  banners.spacash.com
  127.0.0.1  banners2.spacash.com
@@@ -9548,11 -9553,15 +9895,22 @@@
  127.0.0.1  www.traffikcntr.com
  # [Net Access][207.210.64.0 - 207.210.127.255]
  # [Net Access][209.123.0.0 - 209.123.255.255]
++<<<<<<< HEAD
 +127.0.0.1  foundguide.com
++=======
+ # [Net Access][AS8001][50.116.0.0 - 50.116.63.255]
+ 127.0.0.1  lognormal.net
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Net Access][AS8001][64.21.0.0 - 64.21.191.255]
  # [Net Access][64.247.0.0 - 64.247.63.255]
  # [Net Access / Cdnetworks][AS8001][66.114.48.0 - 66.114.63.255]
  127.0.0.1  img.linkstorm.net
++<<<<<<< HEAD
++=======
+ # [Net Access][AS8001][66.175.208.0 - 66.175.223.255]
+ 127.0.0.1  204st.us
+ 127.0.0.1  ipv6.204st.us #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Net Access][AS8001][66.228.32.0 - 66.228.63.255]
  127.0.0.1  tracking.onespot.com
  # [Net Access / DomainSpa][AS8001][66.246.0.0 - 66.246.255.255]
@@@ -9586,7 -9595,6 +9944,10 @@@
  127.0.0.1  go.searchanyway.com
  127.0.0.1  www.searchanyway.com
  # [Netelligent / Gameserverz][67.212.64.0 - 67.212.95.255]
++<<<<<<< HEAD
 +127.0.0.1  sexojet.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [NetHolding][AS24730][81.173.64.0 - 81.173.64.255]
  127.0.0.1  adserver.geenstijl.nl
  127.0.0.1  kassa.geenstijl.nl
@@@ -9640,7 -9648,6 +10001,10 @@@
  127.0.0.1  www.netdirect.nl
  127.0.0.1  startpunt.nu.site-id.nl
  127.0.0.1  www.site-id.nl
++<<<<<<< HEAD
 +127.0.0.1  nbasic.sitestat.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Nedstat][AS42320][77.72.112.0 - 77.72.113.255]
  127.0.0.1  nedstat.nl
  127.0.0.1  www.nedstat.nl
@@@ -9860,7 -9869,6 +10226,10 @@@
  127.0.0.1  netspiderads2.indiatimes.com
  127.0.0.1  netspiderads3.indiatimes.com
  127.0.0.1  adsrv.iol.co.za
++<<<<<<< HEAD
 +127.0.0.1  adserv.it-analysis.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adserver1.journalregister.com
  127.0.0.1  kermit.macnn.com
  127.0.0.1  html.knbc.com #[Omniture]
@@@ -9886,7 -9894,6 +10255,10 @@@
  127.0.0.1  promos.newsok.com
  127.0.0.1  adserver2.news-journalonline.com
  127.0.0.1  ads.newsquest.co.uk #[RealMedia]
++<<<<<<< HEAD
 +127.0.0.1  adsadmin.newsquest.co.uk #[RealMedia][server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  collector.newsx.cc
  127.0.0.1  ads.northjersey.com #[RealMedia]
  127.0.0.1  adserver.nydailynews.com #[RealMedia]
@@@ -9913,8 -9920,6 +10285,11 @@@
  127.0.0.1  ads.signonsandiego.com
  127.0.0.1  ads.space.com #[RealMedia]
  127.0.0.1  ads.sportingnews.com #[RealMedia]
++<<<<<<< HEAD
 +127.0.0.1  ads.standartnews.com #[server down?]
 +127.0.0.1  new.standartnews.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  adlinks.startribune.com
  127.0.0.1  ads.stephensmedia.com
  127.0.0.1  adzone.stltoday.com
@@@ -11353,7 -11367,6 +11737,10 @@@
  127.0.0.1  metrics.crystalcruises.com
  127.0.0.1  metrics.csmonitor.com
  127.0.0.1  metrics.ctv.ca
++<<<<<<< HEAD
 +127.0.0.1  metric.current.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  metrics.dailystrength.org
  127.0.0.1  stats.dallasnews.com
  127.0.0.1  metrics.delias.com
@@@ -12042,7 -12056,6 +12430,10 @@@
  127.0.0.1  a.pokerplayermagazine.co.uk
  127.0.0.1  c.realtytrac.com
  127.0.0.1  a.shop.com
++<<<<<<< HEAD
 +127.0.0.1  t.sixflags.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  a.spicetv.com
  127.0.0.1  h.spill.com
  127.0.0.1  a.tempurpedic.com
@@@ -12123,10 -12136,10 +12514,17 @@@
  127.0.0.1  www.efficienttraffic.com
  127.0.0.1  adserver.magazyn.pl
  # [Ovh Sas][AS16276][188.165.192.0 - 188.165.255.255]
++<<<<<<< HEAD
 +127.0.0.1  serverfarm.adplans.info #[server down?]
 +127.0.0.1  openx.nagrzyby.pl
 +# [Ovh Sas][AS16276][192.95.0.0 - 192.95.63.255]
 +127.0.0.1  ad.asntown.net
++=======
+ 127.0.0.1  openx.nagrzyby.pl
+ # [Ovh Sas][AS16276][192.95.0.0 - 192.95.63.255]
+ 127.0.0.1  ad.asntown.net
+ 127.0.0.1  i.vemba.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Ovh Sas][198.27.64.0 - 198.27.127.255]
  127.0.0.1  webmarketing3x.net
  # [Ovh Sas][213.186.33.0 - 213.186.33.255]
@@@ -12447,7 -12458,6 +12844,10 @@@
  127.0.0.1  x.teenssites.net
  127.0.0.1  unisearch.name #[Spamdexing]
  127.0.0.1  content.unisearch.name
++<<<<<<< HEAD
 +127.0.0.1  usedstone.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Platinum eMedia / Marketing Extensions][AS40818][207.246.196.0 - 207.246.199.255]
  127.0.0.1  adshooter.com #[Adware.AdShooter][Wildcard DNS]
  127.0.0.1  dl.adshooter.com
@@@ -12795,7 -12808,6 +13198,10 @@@
  127.0.0.1  www.adfusion.com
  127.0.0.1  adreadytractions.com
  127.0.0.1  www.adversalservers.com
++<<<<<<< HEAD
 +127.0.0.1  ads.comicskingdom.net #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  bigapple.contextuads.com
  127.0.0.1  cowboy.contextuads.com
  127.0.0.1  loadus.exelator.com
@@@ -12933,8 -12945,6 +13339,11 @@@
  127.0.0.1  analytics.radiatemedia.com
  127.0.0.1  www.silver-path.com
  127.0.0.1  ad.where.com
++<<<<<<< HEAD
 +# [Rackvibe][AS14037][209.250.224.0 - 209.250.255.255]
 +# [Rackvibe][AS14037][64.18.128.0 - 64.18.159.255]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Rambler][AS24638][81.19.70.0 -  81.19.70.255]
  127.0.0.1  ad.rambler.ru #[WebBug]
  127.0.0.1  ad2.rambler.ru
@@@ -13024,13 -13032,6 +13431,16 @@@
  # [Righthosting.com][AS14576][67.220.140.0 - 67.220.141.255]
  127.0.0.1  ads.amateurmatch.com
  127.0.0.1  ads.datinggold.com
++<<<<<<< HEAD
 +# [Root Esolutions][AS5577][193.104.153.0 - 193.104.153.255]
 +# [Root Esolutions / Titan Ltd][AS5577][193.169.12.0 - 193.169.13.255]
 +# [Root Esolutions][AS44042][195.24.72.0 - 195.24.79.255]
 +# [Root Esolutions][AS44042][212.117.160.0 - 212.117.175.255]
 +127.0.0.1  medsearch007.com #[ScamFraudAlert.Pharmacy]
 +# [Root Esolutions / Artem Zhirkov][AS5577][91.212.226.0 - 91.212.226.255]
 +# [Root Esolutions / Altushost][AS44042][91.214.44.0 - 91.214.47.255]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [RTComm.ru / Joint Stock][AS8342][195.161.119.0 - 195.161.119.255]
  127.0.0.1  ad.bannerbank.ru
  127.0.0.1  ad1.bannerbank.ru
@@@ -13299,7 -13300,6 +13709,10 @@@
  127.0.0.1  www.intelli-direct.com #[WebBug]
  127.0.0.1  tags.transportdirect.info #[WebBug]
  # [Serveur-express-nerim][AS13193][80.65.232.0 - 80.65.232.255]
++<<<<<<< HEAD
 +127.0.0.1  stats.ref2000.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  cpc.trafiz.net
  127.0.0.1  t3.trafiz.net
  127.0.0.1  track.trafiz.net
@@@ -13478,8 -13476,7 +13889,12 @@@
  # [Softlayer][AS36351][173.192.0.0 - 173.193.255.255]
  127.0.0.1  d1.24counter.com
  127.0.0.1  www.admixxer.com
++<<<<<<< HEAD
 +127.0.0.1  cdn.angelfishstats.com
 +127.0.0.1  avastats.com #[server down?]
++=======
+ 127.0.0.1  cdn.angelfishstats.com #[server down?]
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  bestdigitalrewards.com
  127.0.0.1  bigbrandrewards.com
  127.0.0.1  c.chango.com
@@@ -13526,6 -13522,7 +13940,10 @@@
  127.0.0.1  zirve100.com
  # [Softlayer][AS36351][184.172.0.0 - 184.173.255.255]
  127.0.0.1  convusmp.admailtiser.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1  adv.li
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  vap2iad2.lijit.com
  127.0.0.1  vap4iad2.lijit.com
  127.0.0.1  t.newscurve.com
@@@ -13537,7 -13534,6 +13955,10 @@@
  # [Softlayer / Future Hosting][AS36351][208.101.16.104 - 208.101.16.111]
  # [Softlayer][208.101.0.0 - 208.101.63.255]
  # [SoftLayer][AS36351][208.43.0.0 - 208.43.255.255]
++<<<<<<< HEAD
 +127.0.0.1  www.addbags.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  banners.adventory.com
  127.0.0.1  as.autoforums.com
  127.0.0.1  as2.autoforums.com
@@@ -13658,7 -13654,6 +14079,10 @@@
  127.0.0.1  www.sacredphoenix.com
  127.0.0.1  srv.sayyac.com
  127.0.0.1  srv.sayyac.net
++<<<<<<< HEAD
 +127.0.0.1  www.shinypics.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  superfastsservers.com #[Spamdexing]
  127.0.0.1  www.superfastsservers.com
  127.0.0.1  www.tangabilder.to
@@@ -14128,7 -14120,6 +14549,10 @@@
  127.0.0.1  www.truesuite.com #[TrueWatch]
  127.0.0.1  www.urpo.com
  127.0.0.1  www.worlds-best-online-casinos.com #[AdWare.Win32.Casino.w]
++<<<<<<< HEAD
 +127.0.0.1  xxx4live.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Theplanet.com][69.56.128.0 - 69.56.255.255]
  127.0.0.1  www.adultdatingtraffic.com
  127.0.0.1  counter.relmaxtop.com
@@@ -14366,7 -14355,6 +14788,10 @@@
  # [Todayhost / Bogal Ab][195.42.102.0 - 195.42.103.255]
  127.0.0.1  myincestclips.net
  127.0.0.1  www.myincestclips.net
++<<<<<<< HEAD
 +127.0.0.1  banners.paneuromedia.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  petsmovies.com
  127.0.0.1  zoomovies.org
  127.0.0.1  www.zoomovies.org
@@@ -14413,7 -14401,6 +14838,10 @@@
  127.0.0.1  jsp2.clickzzs.nl
  127.0.0.1  vip.clickzzs.nl
  127.0.0.1  vip2.clickzzs.nl
++<<<<<<< HEAD
 +127.0.0.1  a1.elekted.com
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [Trueserver][87.233.141.0 - 87.233.228.255]
  127.0.0.1  a3.adzs.nl
  127.0.0.1  a4.adzs.nl
@@@ -15500,7 -15487,6 +15928,10 @@@
  127.0.0.1  link.maxxandmore.com #[Spamdexing]
  127.0.0.1  promo.passioncams.com
  127.0.0.1  banners.payserve.com
++<<<<<<< HEAD
 +127.0.0.1  banners.teeniemovies.com #[server down?]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1  secure.vxsbill.com #[MSM Pay bv]
  # [Virtumundo][AS36332][206.82.176.0 - 206.82.191.255]
  127.0.0.1  virtumundo.com #[Panda.Virtumonde.C]
@@@ -15994,10 -15966,7 +16411,11 @@@
  127.0.0.1  123ads.nl
  127.0.0.1  ad.123ads.nl
  127.0.0.1  statz.123ads.nl
- 127.0.0.1  search7info.com
- 127.0.0.1  www.stasga.com
  # [Worldstream][AS49981][94.100.26.0 - 94.100.27.255]
++<<<<<<< HEAD
 +127.0.0.1  buyonlineviagra.com #[ScamFraudAlert.Pharmacy]
++=======
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  # [WPP Group via various]
  127.0.0.1  adcontent.videoegg.com
  127.0.0.1  core.videoegg.com
@@@ -16877,7 -16846,7 +17295,11 @@@
  # Please forward any additions, corrections or comments by email to
  # hosts@someonewhocares.org
  
++<<<<<<< HEAD
 +# Last updated: Jun 3th, 2013 at 11:35
++=======
+ # Last updated: Jul 22nd, 2013 at 12:28
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  
  # Use this file to prevent your computer from connecting to selected
  # internet hosts. This is an easy and effective way to protect you from 
@@@ -20682,6 -20667,7 +21120,10 @@@ fe80::1%lo0     localhos
  127.0.0.1 cdn1.rmgserving.com
  127.0.0.1 cdn1.xlightmedia.com
  127.0.0.1 cdn2.amateurmatch.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1 cdn2.emediate.eu
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1 cdn3.adexprts.com
  127.0.0.1 cdn3.telemetryverification.net
  127.0.0.1 cdn454.telemetryverification.net
@@@ -20869,6 -20857,7 +21313,10 @@@
  127.0.0.1 dctracking.com
  127.0.0.1 del1.phillyburbs.com
  127.0.0.1 delb.mspaceads.com
++<<<<<<< HEAD
++=======
+ 127.0.0.1 delivery.adyea.com
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  127.0.0.1 demr.mspaceads.com
  127.0.0.1 derkeiler.com
  127.0.0.1 desb.mspaceads.com
diff --cc readme.md
index b1faea1b8,97276c7fd..613fc0809
--- a/readme.md
+++ b/readme.md
@@@ -2,9 -2,7 +2,13 @@@
  
  This repo consolidates several reputable `hosts` files and consolidates them into a single hosts file that you can use.
  
++<<<<<<< HEAD
 +Last updated: June 6, 2013
 +
 +**Currently this hosts file contains 23,073 unique entries.**
++=======
+ **Currently this hosts file contains 22887 unique entries.**
++>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
  
  ## Source of host data amalgamated here