init
merge conflict for .gitignore