rails upgrade
resolved merge conflicts