evernote auth stuff
merge conflicts