delete account
resolve conflicts