identify merge conflicts

Rename newsfragments/xxx.bugfix to newsfragments/699.bugfix #1464

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