Create conflicted edits to make a non-mergeable PR

WARNING: Please do NOT merge or close this PR, for now.

This PR is created to investigate non-mergeable PRs and work on numenta/nupic.tools#85 after I failed to do so with `numenta/experiment` at numenta/experiments#63 .