[questions][chore] resolve conflicts

apps/portal/src/server/router/index.ts

@@ -3,22 +3,13 @@ import superjson from 'superjson';
 import { companiesRouter } from './companies-router';
 import { createRouter } from './context';
 import { protectedExampleRouter } from './protected-example-router';
-<<<<<<< HEAD
 import { questionsAnswerRouter } from './questions-answer-router';
-import { resumesRouter } from './resumes';
-import { resumesDetailsRouter } from './resumes-details-router';
-import { resumesResumeProtectedTabsRouter } from './resumes-resume-protected-tabs-router';
-import { resumesResumeUserRouter } from './resumes-resume-user-router';
-import { resumeReviewsRouter } from './resumes-reviews-router';
-import { resumesReviewsUserRouter } from './resumes-reviews-user-router';
-=======
 import { questionsQuestionRouter } from './questions-question-router';
 import { resumesRouter } from './resumes/resumes-resume-router';
 import { resumesResumeUserRouter } from './resumes/resumes-resume-user-router';
 import { resumeReviewsRouter } from './resumes/resumes-reviews-router';
 import { resumesReviewsUserRouter } from './resumes/resumes-reviews-user-router';
 import { resumesStarUserRouter } from './resumes/resumes-star-user-router';
->>>>>>> main
 import { todosRouter } from './todos';
 import { todosUserRouter } from './todos-user-router';
 
@@ -36,11 +27,8 @@ export const appRouter = createRouter()
   .merge('resumes.star.user.', resumesStarUserRouter)
   .merge('resumes.reviews.', resumeReviewsRouter)
   .merge('resumes.reviews.user.', resumesReviewsUserRouter)
-<<<<<<< HEAD
-  .merge('questions.answers.', questionsAnswerRouter);
-=======
+  .merge('questions.answers.', questionsAnswerRouter)
   .merge('questions.questions.', questionsQuestionRouter);
 
->>>>>>> main
 // Export type definition of API
 export type AppRouter = typeof appRouter;