factory girl and vendor
fix merge conflicts