Abort when auto-correct causes an infinite loop.
Merge pull request #1492 from dblock/conflicting-cops

Abort when auto-correct causes an infinite loop.