Finish user edit, update, index, and destroy actions
Fixing merge problem