Fix kinimari and will_paginate conflict