resolved merge error in Gemfile.lock