changing email and text
merging email conflict