fixed merge conflicts in gemfile.lock