small edits
resolved gemspec conflict