gemfile changed
class added to category
conflicts resolved in gemfile