Added more details to docstring
Removed merge conflict