an user can edit his own profile
fixed merge conflict