update account
fix conflict