first commit
fix conflict in .gitignore