[Beta v5.6.3 Android] Note Conflicts while Editing

[craftzdog (Takuya Matsuyama)]

v5.6.3 is out! Thanks again for reporting