Fixed the item spinner after merge