When there are conflicts, it would be helpful that those conflicting notes are stored in sub-notebooks of the conflict notebook, reflecting where they were stored before.
As I just had a conflict with around 2000 notes after adding a third device with a clean install, at the moment, there is no chance to restore the previous Notebook structure I had. All notebooks are gone. All notes were moved to "Conflicts" directly.