first commit
conflict in gitignore