adding mailers work
fixing conflicts