merge in gemspec patch