Fix gemspec conflicts