fix merge conflict.
[vuplus_dvbapp] / NEWS