fix modify user data
merge the changes