more merge conflicts fixes
Merge branch 'master' of github.com:ylwu/take-my-pills