Updated product details page to include 20 nearest locations with stock
resolve merge conflict