fixed merge conflict in gemfile.lock