fix merge conflicts with background mailers