adding devise edit forms
resolved conflicts