second commit?
second
third
added image
BRANCH with chanes to a
changed one.png, test-branch does not have this.
Merge branch 'test-branch'

very important
simplified a
changed 1.png
changed both a and 1.png
changed both files on master
merged w/branch1
Merge remote-tracking branch 'origin/master'