first commit on new branch
merge conflicts introduced
merge branch newbranch master