Git conflict is not resolved when merging

[mengqiy]

There is a issue in https://github.com/kubernetes/website/blob/d8f04f51c14fef4dc3fe3fed5b195e7e39633e8b/docs/admin/extensible-admission-controllers.md.

<<<<<<< HEAD
1.7 introduced two alpha features, *Initializers* and *External Admission
Webhooks*, that address these limitations. These features allow admission
controllers to be developed out-of-tree and configured at runtime.
=======
Two features, *Admission Webhooks* (beta in 1.9) and *Initializers* (alpha),
address these limitations. They allow admission controllers to be developed
out-of-tree and configured at runtime.
>>>>>>> 4ac258363735f8d35150e4dcd0213516fcdc83b9

It seems the author forget to resolve the conflict when merging.

[mengqiy]

cc @chenopis

[zacharysarah]

@Bradamant3 @steveperry-53 👋 Looks like it was caused by #7861.

[zacharysarah]

/assign @Bradamant3
/assign @steveperry-53