initial commit
fix gitignore conflict