DOC: Clean merging.rst#37014

Merged

jreback merged 4 commits intopandas-dev:masterfrom

dsaxton:clean-merging-doc

Oct 10, 2020

Commits on Oct 9, 2020

Commits on Oct 10, 2020

Merge remote-tracking branch 'upstream/master' into clean-merging-doc
dsaxton
committed