diff --git a/histories/models.py b/histories/models.py
index 5103194..01a9f4d 100644
--- a/histories/models.py
+++ b/histories/models.py
@@ -171,16 +171,6 @@ def generate_partial_history(user, t_start):
     basis = generate_first_url(user)
     result.append(PartialHistoryEntry(basis, timestamp))
     t_start += 5 * random.weibullvariate(1, 1.5)
-<<<<<<< HEAD
-    output_tree = []
-    crawler = crawl.CrawlingThread(basis, output_tree)
-    crawler.start()
-    crawler.join()
-    urls = crawler.output_tree
-    for url in urls:
-        t_start += 5 * random.weibullvariate(1, 1.5)
-        result.append(PartialHistoryEntry(url.url, timestamp))
-=======
     crawler = crawl.CrawlingThread(basis)
     crawler.start()
     crawler.join()
@@ -196,7 +186,6 @@ def generate_partial_history(user, t_start):
             timestamp = open_time[parent] + 5 * random.weibullvariate(1, 1.5)
         open_time[elem] = timestamp
         result.append(PartialHistoryEntry(url, timestamp))
->>>>>>> Real async crawling
     return result
 
 
@@ -257,7 +246,7 @@ def generate_history(user, start_time):
             if len(url) < 200:
                 new_line = HistoryEntry(
                     search=url,
-                    timestamp=datetime.fromtimestamp(timestamp),  # FIXME tz
+                    timestamp=datetime.fromtimestamp(timestamp),
                     history=history
                 )
                 try:
diff --git a/pinocchio/settings.py b/pinocchio/settings.py
index ff1ce17..b7c42c0 100644
--- a/pinocchio/settings.py
+++ b/pinocchio/settings.py
@@ -97,7 +97,7 @@ USE_I18N = True
 
 USE_L10N = True
 
-USE_TZ = True
+USE_TZ = False  # We don't really care, we want POSIX timestamps
 
 
 # Static files (CSS, JavaScript, Images)