updated test script conflicts