Profile update
Profile CRUD created
Fixing merge conflict