up to 9.42 before wiping the db
db reset.
Finish user edit, update, index and destroy actions
foo
fix merge conflicts