Try to fix with devise module
Clean git
Merge
Clean merge