finish devise setup
Merge and Fix conflicts