- fixes
remove will_paginate gem
resolve conflicts