init
resolve .gitignore merge conflict