Fix Merge Error and Addon.d Now/Wallet Error.