711.conflict naming

[meejah]

fixes #711

[codecov]

Codecov Report

Merging #720 (3953f2c) into main (82056a8) will decrease coverage by 0.01%.
The diff coverage is 93.02%.

@@            Coverage Diff             @@
##             main     #720      +/-   ##
==========================================
- Coverage   91.79%   91.78%   -0.01%     
==========================================
  Files          38       38              
  Lines        5141     5149       +8     
  Branches      639      641       +2     
==========================================
+ Hits         4719     4726       +7     
  Misses        277      277              
- Partials      145      146       +1     

Flag	Coverage Δ
integration	72.90% <72.09%> (-0.10%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
src/magic_folder/participants.py	90.07% <81.81%> (-0.16%)	⬇️
src/magic_folder/magic_file.py	96.19% <96.55%> (ø)
src/magic_folder/downloader.py	99.06% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more