update .gitignore
merge remote & local