Resolved conflicts after rebase

Author: emg110

ows/crates/ows-core/src/chain.rs

@@ -183,7 +183,6 @@ pub const KNOWN_CHAINS: &[Chain] = &[
         chain_id: "nano:mainnet",
     },
     Chain {
-<<<<<<< HEAD
         name: "tempo",
         chain_type: ChainType::Evm,
         chain_id: "eip155:4217",
@@ -192,11 +191,11 @@ pub const KNOWN_CHAINS: &[Chain] = &[
         name: "hyperliquid",
         chain_type: ChainType::Evm,
         chain_id: "eip155:999",
-=======
+    },
+    Chain {
         name: "algorand",
         chain_type: ChainType::Avm,
         chain_id: "algorand:wGHE2Pwdvd7S12BL5FaOP20EGYesN73k",
->>>>>>> 9659d24 (feat: add Algorand chain support)
     },
 ];
 

ows/crates/ows-core/src/config.rs

@@ -74,16 +74,14 @@ impl Config {
             "https://s.devnet.rippletest.net:51234".into(),
         );
         rpc.insert("nano:mainnet".into(), "https://rpc.nano.to".into());
-<<<<<<< HEAD
         rpc.insert("eip155:4217".into(), "https://rpc.tempo.xyz".into());
         rpc.insert(
             "eip155:999".into(),
             "https://rpc.hyperliquid.xyz/evm".into(),
-=======
+        );
         rpc.insert(
             "avm:mainnet".into(),
             "https://mainnet-api.algonode.cloud".into(),
->>>>>>> 9659d24 (feat: add Algorand chain support)
         );
         rpc
     }
@@ -270,11 +268,7 @@ mod tests {
     fn test_load_or_default_nonexistent() {
         let config = Config::load_or_default_from(std::path::Path::new("/nonexistent/config.json"));
         // Should have all default RPCs
-<<<<<<< HEAD
-        assert_eq!(config.rpc.len(), 21);
-=======
-        assert_eq!(config.rpc.len(), 20);
->>>>>>> 9659d24 (feat: add Algorand chain support)
+        assert_eq!(config.rpc.len(), 22);
         assert_eq!(config.rpc_url("eip155:1"), Some("https://eth.llamarpc.com"));
     }