Fix conflict markers
[collectd.git] / NEWS