updated documentation
fixed merge conflict