touch file
Merge branch 'new'
Merge branch 'master' of github.com:tinykuai/my-config