If you watch both the “conflict created” events, and the “file updated” events, you should catch all conflicts.