fix broken merge in man page
Merge pull request #3326 from rolandwalker/doc_broken_merge

fix broken merge in man page