Docstrings formatted and unified
fixed merge conflict