Rob's first conflicting change test
Merge pull request #336 from karma-exchange-org/b2

Rob's first conflicting change test