Check for merge conflicts

Fixes users getting locked in simulation view / simulation refactor #18212

Sign in to view logs

Summary
Jobs
- triage
Run details
- Usage
- Workflow file

The logs for this run have expired and are no longer available.