Check for merge conflicts

Fixes binocs destroying while zoomed FOR REAL #15074

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	3s
	3s