made changes
conflict
new branch change
second branch changes
third branch changes
master branch
new changes
fixed new conflict
third changes
final changes