Agrege los cambios pertinetes para el marge de main conmi rama

src/index.tsx

@@ -65,12 +65,9 @@ import RptConsultaTrafico from './Components/Clientes/Amazon/Reportes/ConsultaTr
 import RptMonitoreoFacturasPagadasAmazon from './Components/Reportes/RptMonitoreoFacturasPagadasAmazon'
 import CatFraccionesVulnerables from './Components/Catalogos/CatFraccionesVulnerables/CatFraccionesVulnerables'
 import RptFacturasFraccion from './Components/Reportes/RptContsFacturasFraccion'
-<<<<<<< HEAD
+import CatConceptosConsulta from './Components/Clientes/Amazon/Catalogos/CatConceptosConsulta'
 import RptOperacionesPagadasMisionFood from './Components/Reportes/RptOperacionesPagadasMisionFood'
 import RptFacturasPedimentosPagados from './Components/Reportes/RptFacturasPedimentosPagados'
-=======
-import CatConceptosConsulta from './Components/Clientes/Amazon/Catalogos/CatConceptosConsulta'
->>>>>>> main
 
 require(`./css/${process.env.REACT_APP_ENVIRONMENT}-home.css`)
 
@@ -161,6 +158,12 @@ ReactDOM.render(
               path="/CatFraccionesVulnerables"
               element={<CatFraccionesVulnerables />}
             />
+
+            <Route
+              path="/CatConceptosConsulta"
+              element={<CatConceptosConsulta />}
+            />
+
             <Route
               path="/Rpt1868Transportista"
               element={<Rpt1868Transportista />}
@@ -255,19 +258,12 @@ ReactDOM.render(
               path="/RptConsFacturasFraccion"
               element={<RptFacturasFraccion />}
             />
-<<<<<<< HEAD
 
             <Route
               path="/RptFacturasPedimentosPagados"
               element={<RptFacturasPedimentosPagados />}
             />
 
-=======
-            <Route
-              path="/CatConceptosConsulta"
-              element={<CatConceptosConsulta />}
-            />
->>>>>>> main
             <Route path="*" element={<PageNotFound />} />
           </Route>
         </Routes>