Fixed merge conflict in gemfile.lock