init gem and modify gemspec
merge confict