new commit in testing branch
changes in master after brancbing
Merge branch 'testing'
prepare conflict
prepare conflict in testing
conflict resolved