Fixed merge conflicts again...?

chipathlon/db.py

@@ -38,7 +38,6 @@ class MongoDB(object):
         self.client = MongoClient(host)
         self.db = self.client.chipseq
         self.cache = collections.defaultdict(dict)
-        self.cache = {}
         if username and password:
             try:
                 self.db.authenticate(username, password, mechanism="SCRAM-SHA-1")