Fixed add products in admin section's bug
Fixed Conflicts
Fixed Conflicts