test git diff.
try another branch.
for master branch
for branch 2
Merge branch 'feature1'
for feature1 branch.
conflict branch