stuff
merge conflict
sets email preference hash