post-merge:
fix .gitignore