Revert "Merge branch '210500-missing-merge-conflicts-email-notification' into 'master'"
This reverts !27870 (merged) because it was causing excessive notifications: #212886 (closed)
This reverts !27870 (merged) because it was causing excessive notifications: #212886 (closed)