identify merge conflicts

`FormatSMVJHSim` `AttributeError` bugfix (#710) #3442

Sign in to view logs

Summary
Jobs
- label
Run details
- Usage
- Workflow file

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
label	2m 4s
	2m 4s