rm git
Merge branch 'b4'