Actually resolve factory-girl-and-friends merge