fix merge error with user edit, update, index and destroy actions