update account
resolve conflict