Excessive merge request conflict notifications
Since !27870 (merged) was deployed, a number of us have received an excessive number of e-mail notifications for merge requests that conflict:
It almost seems like every merge request to master may be causing this.
/cc: @dskim_gitlab