code added but not tested
conflicts resolved
kaminari pagination working