merge conflict stuff

Author: RChandler234

src/backend/tests/projects.test.ts

@@ -1,10 +1,6 @@
 import prisma from '../src/prisma/prisma';
 import { getHighestProjectNumber } from '../src/utils/projects.utils';
 import * as changeRequestUtils from '../src/utils/change-requests.utils';
-<<<<<<< HEAD
-import { aquaman, batman, wonderwoman } from './test-data/users.test-data';
-import { prismaProject1, prismaProject2, sharedProject1 } from './test-data/projects.test-data';
-=======
 import { aquaman, batman, wonderwoman, superman, theVisitor } from './test-data/users.test-data';
 import {
   prismaProject1,
@@ -17,9 +13,9 @@ import {
   prismaMaterial,
   prismaMaterialType,
   prismaUnit,
-  prismaMaterial2
+  prismaMaterial2,
+  prismaProject2
 } from './test-data/projects.test-data';
->>>>>>> develop
 import { prismaChangeRequest1 } from './test-data/change-requests.test-data';
 import { primsaTeam2, prismaTeam1 } from './test-data/teams.test-data';
 import * as projectTransformer from '../src/transformers/projects.transformer';

src/frontend/src/pages/ProjectDetailPage/ProjectForm/ProjectFormDetails.tsx

@@ -56,7 +56,7 @@ const ProjectFormDetails: React.FC<ProjectEditDetailsProps> = ({
         </Grid>
         <Grid item lg={project ? 4 : 2.4} md={6} xs={12}>
           <FormControl fullWidth>
-            <ChangeRequestDropdown control={control} name="crId" />
+            <ChangeRequestDropdown control={control} name="crId" errors={errors} />
           </FormControl>
         </Grid>
         {!project && (