update to item_type proposal #152
fix merge conflict