some change
committing first changes to branch
commit another change to branch
creating conflict in master