customer, pagination and product pagination
conflict with master resolved
resolved