adding team2 changes
removing conflicts