adding conflict 2
adding readme
merging conflict ic
Conflict
merging to default
add product function