Added update user feature
Merge conflict resolution