fix: #18 Fix the problem when editing a remote note before resolving the conflict