Commit from local
resolved .gitignore conflicts