docstring merge typo