re-did devise gem
Resolving conflicts