categories
gemfile
merge
merge sunspot ok