1line delete
Merge branch 'master' of https://github.com/ayuthky/test