branch-conflito
main
@@ -1 +1 @@
linha original
linha DA BRANCH
The note is not visible to the blocked user.