try fix Railtie::User unintialized problem
merge