Check for merge conflicts

Merge pull request #2421 from hugo-escire/issue/2105 #719

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