Disabled conflict-tests by default.
Merge pull request #144 from raistlinthewiz/develop

Disabled conflict-tests by default.