fixed merge in gemfile.lock