Merging directly won't do as our code base is quite old and is also a fork of zcash compatible Electrum wallet. Much of the original Electrum wallet source code has changed significantly.
There's a newer Electrum code base 3.3.8.5 that we can transition to (possibly, if no serious issues arise). I will have a look at it when I'm done with nSPV integration.
Merging directly won't do as our code base is quite old and is also a fork of zcash compatible Electrum wallet. Much of the original Electrum wallet source code has changed significantly.