update CRUD of the user && profile
update CRUD of the user && profile
fixed conflict in local and master branch