init gitignore
initial commit
conflict