Added note about symlinks
Fixed the merge conflict