fix test_conflicts test