Fix gemspec bad merge