users are a thing now. back button doesn't appear on index
back button goes back
resolve merge conflicts