add user.balance
merge conflict