update test_conflict