Pagination added with kaminari
fixed conflicts