Resolve conflict in doc string

Fixed an unresolved merge conflict which allowed git diff markers to be
commited. These then went on to cause more merge conflicts later on.
Unfortunately the way I solved this made the git log look like a bit of
a pyramid but at least I think it shows clearly how this was solved.