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