validate email
remove salmon coffee
merge conflict