master branch user.rb sync