fix links index

archivebox/templates/link_index.html

@@ -245,7 +245,7 @@
                             ArchiveBox
                         </a>
                     </div>
-                    <div class="col-lg-10">
+                    <div class="col-lg-8">
                         <img src="$link_dir/$favicon_url" alt="Favicon">
                         &nbsp;&nbsp;
                         $title

archivebox/util.py

@@ -450,7 +450,7 @@ def merge_links(a: Link, b: Link) -> Link:
 
     sources = list(set(a.sources + b.sources))
 
-    all_methods = (set(a.history.keys()) | set(a.history.keys()))
+    all_methods = set(list(a.history.keys()) + list(a.history.keys()))
     history = {
         method: (a.history.get(method) or []) + (b.history.get(method) or [])
         for method in all_methods