Fixed shipping price when showing variations.
merged conflicts