merge conflict resolution
@@ -1,2 +0,0 @@
# member_directory
The note is not visible to the blocked user.