Create conflicted edits to make a non-mergeable PR

WARNING: Please do NOT merge or close this PR. This PR is created to investigate non-mergeable PRs and work on numenta/nupic.tools#85 .