new gitignore to fix conflicts.