Conflicts are normal in syncing. Even git has conflicts. Although SN's conflict resolution is a bit weird where it creates multiple copies of the note...I think

Conflicts are normal in syncing. Even git has conflicts. Although SN's conflict resolution is a bit weird where it creates multiple copies of the note...I think this may be because they mark conflicted notes on the server using timestamps.