init
resolve .gitignore conflicts