fixing bad rails errors from stupid merges
still working on merge
hopefully finishing merge