debugging and items model/table

also removed conflicts