my explanation
Merge pull request #1 from davidsiaw/master

my explanation
fix merge conflicts