resolve conflict (2)