first commit message
made a change
another change - master branch
testing conflict merging
commit for merging on test branch
merged confilct