Check for merge conflicts

Merge pull request #1100 from stephenglass/patch-1 #977

Sign in to view logs

Summary
Jobs
- main
Run details
- Usage
- Workflow file

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
main	2m 5s
	2m 5s