Alters file 2
Adds file 3
Alters file 3
Merge branch 'my-other-branch'