Fix merge conflicts
Merge branch 'master' of github.com:mks65-dw/shell