diff --git a/_cache/webmentions.json b/_cache/webmentions.json
index 159456cd93..bbb3602cd6 100644
--- a/_cache/webmentions.json
+++ b/_cache/webmentions.json
@@ -1,6 +1,5 @@
 {
-HEAD
-  "lastFetched": "2025-04-17T13:35:25.277Z",
+  "lastFetched": "2025-04-17T14:16:38.295Z",
   "children": [
     {
       "type": "entry",
@@ -10543,11 +10542,7 @@ HEAD
       "author": {
         "type": "card",
         "name": "Jay Hoffmann",
-<<<<<<< HEAD
-        "photo": "https://avatars.webmention.io/spaces.hcommons.social/88e884c089f4656928b8309b52195dba2f0e6e47fd640b6bfb9cec7c9a25c884.png",
-=======
         "photo": "https://webmention.io/avatar/spaces.hcommons.social/88e884c089f4656928b8309b52195dba2f0e6e47fd640b6bfb9cec7c9a25c884.png",
->>>>>>> eeb1004b46656e17fc35a3b12c0eb9482e42725a
         "url": "https://mastodon.social/@Jayhoffmann"
       },
       "url": "https://hcommons.social/@kfitz/114184994490323057#favorited-by-109331292461320201",
@@ -10562,4 +10557,4 @@ HEAD
       "wm-private": false
     }
   ]
-}
+}
\ No newline at end of file