fixed my account to add products if no products are listed
not sure
fixed merge conflict
Merge branch 'product'