fix conflict
Merge branch 'master' of https://github.com/nikky9meter/theshortcut
Merge branch 'master' of https://github.com/nikky9meter/theshortcut
Merge branch 'master' of https://github.com/nikky9meter/theshortcut
update file