added devise
fixed merge