Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update merge conflict labelling action
Have been seeing some errors, hopefully this will fix.
- Loading branch information