Update .gitignore
Merge local-deploy