[relnotes] [Bug 885067] New: A conflict in F18 release notes