correct Factory Girl create user
fix merge issue in factory.rb