diff --git a/newsfragments/2965.bugfix b/newsfragments/2965.bugfix
new file mode 100644
index 000000000..58d4582e8
--- /dev/null
+++ b/newsfragments/2965.bugfix
@@ -0,0 +1 @@
+Magic-Folders now creates spurious conflict files in fewer cases.  In particular, if files are added to the folder while a client is offline, that client will not create conflict files for all those new files when it starts up.