Check for merge conflicts

Merge pull request #5924 from MikeTheWallDweller/patch-2 #2922

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