Resolve conflict in doc string

Fixed a unresolved merge conflicted 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 it least I think it shows clearly how this was solved.