The note is not visible to the blocked user.
when merge conflict be resolved?
@javalsai when
javalsai's branch is better
bro's literally sapmix