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

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
triage	5s
	5s