fix: merge conflicts

Charles-Henri Decultot requested to merge emails_are_muted into develop Apr 19, 2024