test_conflict_resolution