devise
devise fix double error sign up
resolve conflicts