ignore a few more types
fix merge conflict in gitignore