fix missed merge conflict
[fw/altos] / NEWS