added devise
merge devise