first commit
fix conflict on .gitignore