Comment out / add note about conflicting gitignore lines (#3204)
* Remove conflicting gitignore lines, add reference
Ref (introduction of a new "public" folder in Next.js):
https://nextjs.org/blog/next-9-1#public-directory-support
* Improve solution to conflicting files