I created a second file.

It contains nonsense.  Forgive me.
Merge branch 'master' into newbranch
merge conflict one
merge conflict two
Resolved merge conflict
added .gitignore with *.orig