From 5eb18d3a7a4b268331b62cfb72d3f5f9a230ed84 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 1 Sep 2023 14:35:14 -0700
Subject: [PATCH] Merge conflict resolved

---
 tools/ci_check_duplicate_usb_vid_pid.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 5232f6dc7c..f22225007b 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -64,6 +64,7 @@ DEFAULT_CLUSTERLIST = {
     "0x239A:0x102E": ["weact_studio_pico", "weact_studio_pico_16mb"],
     "0x303A:0x8166": ["yd_esp32_s3_n8r8", "yd_esp32_s3_n16r8"],
     "0x2341:0x056B": ["arduino_nano_esp32s3", "arduino_nano_esp32s3_inverted_statusled"],
+    "0x2E8A:0x1020": ["waveshare_rp2040_plus_4mb", "waveshare_rp2040_plus_16mb"],
 }
 
 cli_parser = argparse.ArgumentParser(