devise secret key
merged conflicts