editing gemspec
fixed conflict