first change in new branch
second change
hotfixins
this change after hotfix
Merge branch 'master' into issue53
fakebranch NEW
master OTHER NEW
my first conflict resolution