Tried to accept symlinks
Fixed conflict