installed and configured pagination... I think
Resolve magination merge conflict
Resolve magination merge conflict