fix naming conflict with devise
test fix for devise conflict fix;