edited gemfile
resolved merge conflicts