product details update
fixed conflicts