ARTEMIS-8027 - conflict testing
Merge branch 'master' of https://github.com/brettcave/fuzzy-octo-ninja