finish user edit, update, index and destroy
merge confilcts fixed