fixing merge conflicts
fixing merge conflicts

numenta-archive/htmresearch,numenta-archive/htmresearch,numenta-archive/htmresearch,numenta-archive/htmresearch,numenta-archive/htmresearch,numenta-archive/htmresearch