Remove conflicts from api's products_controller due to bad rebase