updated deps, account number test fails
fix conflicts