updated Feynman conflicts