updated Gemfile.lock
fixed merge conflicts in Gemfile.lock