removed team info
conflict res