uh oh conflicts
initial import commodities
fixed conflicts