changes to second branch
cause conflict
conflict
fixed conflict
second branch changes
third branch changes
resolved conflict