Challenge #03373-I085: Conflict Resolution