merge back fixed .gitignore