diff --git a/dns_compare.py b/dns_compare.py
index 71c4548..c98d033 100755
--- a/dns_compare.py
+++ b/dns_compare.py
@@ -455,13 +455,6 @@ end_time_iso = datetime.fromtimestamp(end_time).isoformat()
 elapsed_time = end_time - start_time
 elapsed_ms = int(elapsed_time * 1000)
 
-<<<<<<< HEAD
-output["metadata"] = {
-    "start_time": start_time_iso,
-    "end_time": end_time_iso,
-    "runtime": f"{elapsed_time:.2f}s"
-}
-=======
 output["metadata"]["timing"]["start_time"] = start_time_iso
 output["metadata"]["timing"]["end_time"] = end_time_iso
 output["metadata"]["timing"]["runtime_ms"] = elapsed_ms
@@ -476,6 +469,5 @@ for provider_stats_dict in provider_stats.values():
     for key, count in provider_stats_dict.items():
         total_stats[key] = total_stats.get(key, 0) + count
 output["metadata"]["statistics"]["total"] = total_stats
->>>>>>> b2565dd (Updated to have better json format and statistics.)
 
 print(json.dumps(output, indent=4))