Duplicate Feeds after upgrading 2.3 to 3.1