add hello git
remove hello git
resolve modify conflict
Merge branch 'b1'