#1448: tried fixing come merge confilcts resulting from import statements

Author: Bennyzhu1

src/backend/src/services/reimbursement-requests.services.ts

@@ -22,6 +22,8 @@ import {
 import prisma from '../prisma/prisma';
 import {
   isUserAdminOrOnFinance,
+  createReimbursementProducts,
+  isUserLeadOrHeadOfFinanceTeam,
   removeDeletedReceiptPictures,
   updateReimbursementProducts,
   validateReimbursementProducts,

src/backend/src/utils/reimbursement-requests.utils.ts

@@ -3,7 +3,16 @@
  * See the LICENSE file in the repository root folder for details.
  */
 
-import { ReimbursementProductCreateArgs, ReimbursementReceiptCreateArgs, WbsNumber, isAdmin, wbsPipe } from 'shared';
+import {
+  OtherProductReason,
+  OtherReimbursementProductCreateArgs,
+  ReimbursementProductCreateArgs,
+  ReimbursementReceiptCreateArgs,
+  ValidatedWbsReimbursementProductCreateArgs,
+  isAdmin,
+  wbsPipe,
+  WbsReimbursementProductCreateArgs
+} from 'shared';
 import prisma from '../prisma/prisma';
 import { AccessDeniedException, DeletedException, HttpException, NotFoundException } from './errors.utils';
 import { Prisma, Receipt, Reimbursement_Product, Team, User } from '@prisma/client';