Developer
Resolve merge conflict: keep fixed docstring syntax
35d5226