Don't allow conflicts by default
Merge pull request #2477 from ethomson/merge

Don't allow conflicts by default