Resolve conflict test again.