Store pagination per_page in session
Fix merging conflicts