first commit
gemspec
fix conflicts