From 1c419ce7c43c03eaf9db6aec026aa3be7ac5192d Mon Sep 17 00:00:00 2001
From: Brad Erhart <31287649+braderhart@users.noreply.github.com>
Date: Sun, 21 Apr 2019 22:59:44 -0700
Subject: [PATCH] Fix Git merge conflict (#13921)

Previous doc page had `<<<<<<< HEAD`, `=======` and `>>>>>>> upstream/master`