diff --cc swh/storage/tests/test_converters.py
index 72443ec4,f3ee1904..00000000
--- a/swh/storage/tests/test_converters.py
+++ b/swh/storage/tests/test_converters.py
@@@ -144,7 -144,7 +144,11 @@@ def test_db_to_release()
  def test_db_to_git_headers():
      raw_data = [
          ["gpgsig", b"garbage\x89a\x43b\x14"],
++<<<<<<< HEAD
 +        ["extra", [b"foo\\\\\\o", b"bar\\", b"inval\\\\\x99id"]],
++=======
+         ["extra", [b"fo\\\\\\o", b"bar\\", b"inval\\\\\x99id"]],
++>>>>>>> Add a wrapper to manage a sorted list.
      ]
  
      db_data = converters.git_headers_to_db(raw_data)
diff --cc swh/storage/tests/test_utils.py
index a8c680fd,5f65cdbe..00000000
--- a/swh/storage/tests/test_utils.py
+++ b/swh/storage/tests/test_utils.py
@@@ -64,9 -64,7 +64,13 @@@ def test_content_hex_hashes()
      }
  
      expected_content = {
++<<<<<<< HEAD
 +        "blake2s256": (
 +            "8f677e3214ca8b2acad91884a1571ef3" "f12b786501f9a6bedfd6239d82095dd2"
 +        ),
++=======
+         "blake2s256": "8f677e3214ca8b2acad91884a1571ef3f12b786501f9a6bedfd6239d82095dd2",
++>>>>>>> Add a wrapper to manage a sorted list.
          "sha1_git": "ba9aaa145ccd24ef760cf31c74d8f7ca1a2e47b0",
          "sha256": "2bb787a73e37352f92383abe7e2902936d1059ad9f1ba6daaa9c1e58ee6970d0",
          "sha1": "38762cf7f55934b34d179ae6a4c80cadccbb7f0a",
@@@ -81,9 -79,7 +85,13 @@@
  
  def test_content_bytes_hashes():
      input_content = {
++<<<<<<< HEAD
 +        "blake2s256": (
 +            "8f677e3214ca8b2acad91884a1571ef3" "f12b786501f9a6bedfd6239d82095dd2"
 +        ),
++=======
+         "blake2s256": "8f677e3214ca8b2acad91884a1571ef3f12b786501f9a6bedfd6239d82095dd2",
++>>>>>>> Add a wrapper to manage a sorted list.
          "sha1_git": "ba9aaa145ccd24ef760cf31c74d8f7ca1a2e47b0",
          "sha256": "2bb787a73e37352f92383abe7e2902936d1059ad9f1ba6daaa9c1e58ee6970d0",
          "sha1": "38762cf7f55934b34d179ae6a4c80cadccbb7f0a",