Handle sync duplicates better