fix conflicts

src/App.tsx

@@ -7,6 +7,7 @@ import { useState } from 'react';
 import IssuePage from './pages/issuePage';
 import { CommitPage } from './pages/commitGraphPage/CommitPage';
 import { IssueGraphPage } from './pages/issueGraphPage/issueGraphPage';
+import CommitPageWrapper from "./pages/commitListPage/commitPageWrapper"
 
 function App() {
     const [testContext, setTestContext] = useState<string>('Admin');    
@@ -32,7 +33,7 @@ function App() {
                     <IssueGraphPage />
                 </Route>
                 <Route exact path={"/commitlist"}>
-
+                    <CommitPageWrapper/>
                 </Route>
                 <Route exact path={"/commitgraph"}>
                     <GlobalCommitContext.Provider value = {{testContext, setTestContext}}>

src/pages/CommitPage/commitPage.tsx → src/pages/commitListPage/commitListPage.tsx

 import React, {FC, useState} from 'react';
 import {Commit} from "../../utils/queryType";
 import Select, {SingleValue} from "react-select";
-import style from "./commitPage.module.css"
+import style from "./commitListPage.module.css"
 
 
 interface iSingleCommit {
@@ -26,7 +26,7 @@ const SingleCommit: FC<iSingleCommit> = (props) => {
             <div className={style.Description}>
                 <b>Author: </b>
                 <p>
-                    {props.author_name} at {props.created_at.getUTCDate()}.{props.created_at.getUTCMonth()}
+                    {props.author_name} at {props.created_at.getUTCDate()}.{props.created_at.getUTCMonth()+1}
                     - {props.created_at.getUTCHours()}:{props.created_at.getUTCMinutes()}
                 </p>
             </div>

src/pages/CommitPage/commitPageWrapper.tsx → src/pages/commitListPage/commitPageWrapper.tsx

 import React, {useEffect, useState} from 'react';
-import CommitComponent from "./commitPage";
+import CommitComponent from "./commitListPage"
 import {useGitlabApi} from "../../utils/gitlab_api_service";
 import {queryTypes, Commit} from "../../utils/queryType";
-import style from "./commitPage.module.css"
+import style from "./commitListPage.module.css"
 import Loader from "react-loader-spinner";