Conflict-fixed after finish user edit, update, index, and destroy actions