Conflicts occuring when they shouldn't be

Can you try this please

  1. Pick a note that isn't in Conflicts
  2. Find its id (either in its properties or can right click on it and copy markdown link)
  3. Find it in Dropbox under Apps/Joplin, the file will be named <note id>.md and copy updated_time
  4. Open your Joplin database which should be in your user profile dir in .config/joplin-desktop/database.sqlite and run these queries:
select updated_time from notes where id = '...'
select * from sync_items where item_id  = '..'

Save the results
5. Now edit that note and sync, make note of the time you edited it
6. Assuming the note gets moved to Conflicts repeat steps 3 & 4 and share the results