Added Edit User Method
Merge conflict