updated Gemfile.lock
updated gemfile
fixed merge conflict in Gemfile.lock