added new uploader for product image
conflict resolved