adding comment for team2
removing conflicts