Handle scan conflict edge cases

[navaronbracke]

If a conflict occurs during scanning and later during the scan that conflict is actually cleared by having all owners resolve through other devices that are found, the app still goes to the conflicts screen.

Instead we should do the following:

• skip the conflicting owners page if the conflicts were automatically resolved later in the scan
• handle the case where two devices with the same name, but different mac address are found
  • display this device as skipped, because a device with the same name was already found
  • do not add the owners of this device to the list of owners
• let the conflicting scan results observe when their conflicting owners are resolved later
  • if a conflicting owner is removed because it is resolved later -> update for the new list of conflicting owners (this should decrement)