fix merge
[vuplus_dvbapp] / NEWS