Work on the documentation
Fix merge conflict
Merge conflicts