finish user edit, update, index, and destroy actions
finish user edit, update, index, and destroy actions
fix confilcts and merge