use the conflict event
Merge pull request #1 from maxogden/conflicts

use the conflict event