test-conflict-b
test-conflict-a
@@ -1 +1,3 @@
A侧:组长,我在
B侧:组员你好
(已手动合并两边内容)
The note is not visible to the blocked user.