volunteer devise stuff
merge conflict