Have add devise
have solved conflict