Finish user edit, update, index, and destroy actions
Fix conflicts with merging User Edit and Delete