init
resolve .gitignore conflict