Initial commit (the only one in master)
I make merge conflicts happen… with one file in repo.