first commit
resolve gitignore conflict