diff --git a/src/services/index.js b/src/services/index.js
index aeceee3..abcce60 100644
--- a/src/services/index.js
+++ b/src/services/index.js
@@ -23,11 +23,7 @@ import FinancialMgm from "./FinancialMgm";
 import DataAnalysisPrediction from "./DataAnalysisPrediction";
 import ParkingOverview from "./ParkingOverview";
 import OffPeak from "./OffPeak";
-<<<<<<< Updated upstream
 import NewEnergy from "./NewEnergy";
-=======
-import NewEnergy from "./NewEnergy"
->>>>>>> Stashed changes
 const api = {};
 export default {
   ...api,