diff --git a/doc/design/assistant/blog/day_18__merging.mdwn b/doc/design/assistant/blog/day_18__merging.mdwn
index 43b8f49581..44a79e14ff 100644
--- a/doc/design/assistant/blog/day_18__merging.mdwn
+++ b/doc/design/assistant/blog/day_18__merging.mdwn
@@ -51,9 +51,9 @@ code, and make `git annex sync` use it. Here's how it looks:
 	nothing to commit (working directory clean)
 	ok
 	merge synced/master 
-	CONFLICT (modify/delete): passwd deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of passwd left in tree.
+	CONFLICT (modify/delete): bar.png deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of bar.png left in tree.
 	Automatic merge failed; fix conflicts and then commit the result.
-	passwd: needs merge
+	bar.png: needs merge
 	(Recording state in git...)
 	[master 0354a67] git-annex automatic merge conflict fix
 	ok