add file
modifly file
vs 2
Merge branch 'feature1'
fix bug
merge fix bug