Merge conflict visible on site #13941
Description
This is a Bug Report
Problem: https://kubernetes.io/docs/setup/pick-right-solution/ renders with a visible merge conflict. Can see <<<< HEAD ... >>>>> upstream/master. See image.
Proposed Solution:
Find and remove merge conflict.
Page to Update:
https://kubernetes.io/docs/setup/pick-right-solution/