Devise Error
Merges are a pain
Implemented Devise