QA Team change 3 - conflict