additional gitignores
fix conflict in .gitingnore