Delete test.txt
Merge remote branch 'origin/master'