Change gitignore location
Merge upstream and local changes