delete xx.txt;
Merge branch 'new'
xx