resolve conflicts

Author: KJunWei

frontend/src/api/user/data.ts

@@ -7,15 +7,9 @@ export const createUser = (email: string, token: string) =>
 export const getAllAdminUsers = () =>
   UserHttpClient.get<UserModel[]>("/adminusers");
 
-<<<<<<< HEAD
 export const getAllNormalUsers = () => UserHttpClient.get<UserModel[]>("/normalusers");
-
-export const createAdminUser = (email: string) =>
-  UserHttpClient.post<UserModel>("/useradmin", { email: email });
-=======
 export const createAdminUser = (email: string, token: string) =>
   UserHttpClient.post<UserModel>("/useradmin", { email: email, token: token });
->>>>>>> master
 
 export const getUser = (email: string) =>
   UserHttpClient.get<UserModel>("/user", { params: { email: email } });

frontend/src/pages/profile.tsx

@@ -81,14 +81,9 @@ export default function Profile() {
             ))}
           </Grid>
         </Grid>
-<<<<<<< HEAD
-        <DeleteButtonModal/>
-        {user?.role == 'maintainer' && <AdminUsersTable/>}
-        {user?.role == 'maintainer' && <NormalUsersTable/>}
-=======
         <DeleteButtonModal />
         {user?.role === "master" && <AdminUsersTable />}
->>>>>>> master
+        {user?.role === "master" && <NormalUsersTable />}
       </Container>
     </Box>
   );