email saving;
fix merge conflicts