merge .gitignore change (trouble shooting)