Fix up bad merge conflict resolution
Fix up bad merge conflict resolution

These snuck in during a merge forward. Usually I check for `<<<<<` and `>>>>>`
lines, but I must have missed that check on the merge forward for this files. It
wasn't caught in tests since all of the merge conflict lines are in docs.

Fixes #46860

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt