Improving the documentation
Resolved documentation conflict