first commit
cause conflict
conflict
fixed merge conflicts
first change
second change
third change
fixed second conflict
final conflict fixed