fix merge issue to fix dvb-t