Fixing devise
Fixing merge conflict