lib/model: Refactor conflict name handling (#5572)
lib/model: Refactor conflict name handling (#5572)


wweich/syncthing,imsodin/syncthing,wweich/syncthing,xduugu/syncthing,syncthing/syncthing,imsodin/syncthing,xduugu/syncthing,syncthing/syncthing,syncthing/syncthing,syncthing/syncthing,syncthing/syncthing,AudriusButkevicius/syncthing,wweich/syncthing,syncthing/syncthing,AudriusButkevicius/syncthing,xduugu/syncthing,AudriusButkevicius/syncthing,AudriusButkevicius/syncthing,wweich/syncthing,imsodin/syncthing,imsodin/syncthing,xduugu/syncthing,imsodin/syncthing