edit user
Added edit user information (manual merge)