Mapping terrestrial_event_locator and terrestrial_programme_crid from Nitro to YouView
Fixed conflicts