remove conflicts from test script