enoek merge conflict?

Frontend/power-tracker/src/components/enoekAdd.tsx

@@ -57,7 +57,6 @@ interface ManageAddingProps {
 //class for the data getting fetched from processes
 class Processes {
     name: string = "";
-<<<<<<< HEAD
     constructor(name: string) {
         this.name = name;
     }
@@ -66,16 +65,6 @@ class Processes {
 
 const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search }) => {
     //start and enddate storage for the calendar pickers
-=======
-     constructor(name: string) {
-         this.name = name; 
-     }
-}
-
-
-const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search }) =>{
-    const [title, setTitle] = useState("");
->>>>>>> 28d4a141fb2e68bf004f7b1bf506fee7d7b36df9
     const [startDate, setStarDate] = React.useState<Date>()
     const [endDate, setEndDate] = React.useState<Date>()