working on updating user
merging