fixed Gemfile.lock conflict
pagination works