Added user CRUD
Fixed merge conflict