chore: resolve conflicts

Author: alainncls

json/linea-mainnet-token-shortlist.json

@@ -819,8 +819,8 @@
       "name": "Staked USDe",
       "symbol": "sUSDe",
       "decimals": 18,
-      "createdAt": "2025-11-10T10:26:33.518Z",
-      "updatedAt": "2025-11-10T10:26:33.518Z",
+      "createdAt": "2025-11-10",
+      "updatedAt": "2025-11-10",
       "logoURI": "https://coin-images.coingecko.com/coins/images/33669/large/sUSDe-Symbol-Color.png?1716307680"
     },
     {