email guidelines
fix merge