included factory girl
merge conflict