Handling public links
Documentation
Fixing merge conflicts