devise is functional
file cleanup
resolve merge conflicts