new branch
second branch
testing commits to branch
changing first branch
merge conflict
merge conflict resolved