Initial commit
fix conflict of .gitignore file