.gitignore is now working.
fix conflict.