Fix two typos in the merge docs.
Merge pull request #1615 from arthurschreiber/patch-1

Fix two typos in the merge docs.