adding team -2 code
removal of conflicts