Add jasons quiz

Author: Dlafferty251

lesson_03/quiz/src/quizzes/quizzes.module.ts

@@ -1,12 +1,12 @@
 import { Module } from '@nestjs/common';
 import { AnotherQuiz } from './another_quiz.js';
 import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
-import { JasonWatsonQuiz } from './jason_watson_quiz.js';
-import { MeikoStephensQuiz } from './meiko_stephens_quiz.js';
 import { DavidAdenaikeQuiz } from './david_adenaike_quiz.js';
 import { DylanLaffertyQuiz } from './dylan_lafferty_quiz.js';
+import { JasonWatsonQuiz } from './jason_watson_quiz.js';
 import { Jbeyquiz } from './jbeyquiz.js';
 import { KhaylaSaundersQuiz } from './khayla_quiz.js';
+import { MeikoStephensQuiz } from './meiko_stephens_quiz.js';
 import { MercedesMathewsQuiz } from './mercedes_mathews_quiz.js';
 import { RasheedMillerQuiz } from './rasheed_miller_quiz.js';
 
@@ -22,16 +22,7 @@ const QUIZ_PROVIDERS = [
   KhaylaSaundersQuiz,
   DylanLaffertyQuiz,
   RasheedMillerQuiz,
-<<<<<<< HEAD
   JasonWatsonQuiz,
-=======
-  DylanLaffertyQuiz,
-<<<<<<< HEAD
->>>>>>> bd49b74 (David Adenaike Quiz (#119))
-=======
-  RasheedMillerQuiz,
-  DavidAdenaikeQuiz,
->>>>>>> 76dab3b (I have created a new branch adding in Homework 3 because of a merge bug on my last branch)
 ];
 
 @Module({