init
resolve merge conflict .gitignore