Resolved merge conflict by incorporating both suggestions.

src/main.rs

@@ -160,7 +160,7 @@ fn startup(server: http::Uri, dangerous: bool, seed: Option<String>, first_sync:
         std::io::Error::new(ErrorKind::Other, e)
     })?;
 
-      let lightclient = match seed {
+    let lightclient = match seed {
         Some(phrase) => Arc::new(LightClient::new_from_phrase(phrase, &config, latest_block_height)?),
         None => Arc::new(LightClient::read_from_disk(&config)?)
     };