add public folder to git ignore
merge conflicts