some updates
changed email text color
fixed merge conflict