fixed merge conflicts in Gemfile.lock