diff --git a/frontend/src/utils.js b/frontend/src/utils.js
index 613b5e1..d99089b 100644
--- a/frontend/src/utils.js
+++ b/frontend/src/utils.js
@@ -1127,7 +1127,6 @@ class DataUtils {
 				},
 			],
 		},
-<<<<<<< Updated upstream
 	];
 
 	static dummyWarrantyData = [
@@ -1281,8 +1280,6 @@ class DataUtils {
 			warrantyType: "Parts Only",
 			systemType: "Commercial Irrigation",
 		},
-=======
->>>>>>> Stashed changes
 	];
 }