added devise
merge