starting the documentation
fixing merge conflict