resolve merge conflicts
Merge pull request #10 from EmFoley/fixers

resolve merge conflicts