merge inconsistent wallets
merge wallet cflt management with master