Check for merge conflicts

fixes high combustion napalm and sticky napalm working for OT assembl… #21816

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	4m 7s
	4m 7s