this is D1
this is D2
add E2
modify  C5
Merge branch 'develop'
add C5
Merge branch 'develop'
To test a conflict issue
fix conflict
test merge case 1