updated .gitignore with upload folder
conflicts resolved