Don't try a merge if type changes, just take the new version
Merge pull request #369 from atlasapi/talktalk-vod-extract-as-film

TalkTalk VOD: Ingest films as films instead of top-level items
Merge pull request #370 from atlasapi/remove-platform-links-from-regions

prevent orphaned regions appearing on a platform
Add FilmEquivalenceGenerate for VOD equivalence updaters
Merge branch 'top-level-item-vod-equivalence' into stage