in branch
feature 1
master
Merge branch 'feature1'
file conflict test
trying conflict
conflict
conflict
conflict
resolve conflict