stripped out devise
resolved merge conflicts