diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index 57e3dc7e7..af93af3c9 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -6,11 +6,15 @@ import baseMixin from "@/mixins/base-mixin.js";
 
 export const promoPartNumberStrings = {
     WIPER_DISCOUNT_PART_NUMBER: "WIPER DISCOUNT",
+<<<<<<< HEAD
 <<<<<<< HEAD
     RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN",
 =======
     RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISCOUNT",
 >>>>>>> 2730b0650 (CASH-1426)
+=======
+    RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN",
+>>>>>>> 3b171fe57 (CASH-1426)
     GLASS_DISCOUNT_PART_NUMBER: "DISCOUNT",
     GLASS_CLEANER_DISCOUNT_PART_NUMBER: "DISC GLASS CLN",
 };