merge pr conflict

lib/src/lightclient.rs

@@ -449,7 +449,7 @@ impl LightClient {
                 sync_status     : Arc::new(RwLock::new(WalletStatus::new())),
             };
 
-
+        // println!("Setting birthday to {}", birthday);
         l.set_wallet_initial_state(birthday);
         #[cfg(feature = "embed_params")]
         l.read_sapling_params();