diff --git a/salt/runner.py b/salt/runner.py
index d86f763a8e..99253ea4b7 100644
--- a/salt/runner.py
+++ b/salt/runner.py
@@ -53,7 +53,6 @@ class RunnerClient(mixins.SyncClientMixin, mixins.AsyncClientMixin, object):
 
         .. code-block:: python
 
-<<<<<<< HEAD
             >>> opts = salt.config.master_config('/etc/salt/master')
             >>> runner = salt.runner.RunnerClient(opts)
             >>> runner.cmd('jobs.list_jobs', [])