merge emailchallenge manually
email & setting edited