new .gitignore
initial commit
merge conflict