finish a little custom for devise
fix conflict