rename gemspec file
resolve merge