Update test_conflict