diff --git a/doc/bugs/files_lost_during_upgrade.mdwn b/doc/bugs/files_lost_during_upgrade.mdwn
index 7c38af7c43..afab38d81a 100644
--- a/doc/bugs/files_lost_during_upgrade.mdwn
+++ b/doc/bugs/files_lost_during_upgrade.mdwn
@@ -2186,3 +2186,6 @@ channel 4: bad ext data
 
 # End of transcript or log.
 """]]
+
+> [[fixed|done]]; the merge race has been fixed. The upgrade loop has also
+> been dealt with. --[[Joey]]