edit user profile
resolve conflict
update user profile