Fix merge conflict
[mech_eap.orig] / mech_eap / NEWS