Email and style changes
merge errors