Added migration - type to items
fix conflict