fix merge

src/components/IncompleteEvent/IncompleteEvent.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import styles from "./IncompleteEvent.module.css";
-import getAllEvents from "../../utils/event/getAllEvents";
+import getAllEvents from "../../utils/events/getAllEvents";
 
 function IncompleteEvent() {
   const [events, setEvents] = useState([]);

src/components/chart/ParticipationChart.jsx

@@ -3,7 +3,7 @@ import { Doughnut } from "react-chartjs-2";
 import { Chart, ArcElement } from "chart.js";
 import { MenuItem, Select, FormControl } from "@mui/material";
 import styles from "./ParticipationChart.module.css";
-import getAllEvents from "../../utils/event/getAllEvents";
+import getAllEvents from "../../utils/events/getAllEvents";
 
 Chart.register(ArcElement);