Link the whole product box in product link
Merge conflicts