Implemented edit User
FIxed conflicts