Configure devise.
Fix merge conflict.