another conflict, this one i missed