solve confilict
Merge branch 'master' of https://github.com/New-Begin/Touch.git