fix: fixing merge conflicts occurring in git.

Author: JEKLUND251

lesson_10/libraries/src/loaders/loaders.module.ts

@@ -3,11 +3,11 @@ import { DylanLaffertysLoader } from './dylan_lafferty_loaders.js';
 
 import { AnthonyMaysLoader } from './anthony_mays_loader.js';
 import { JustinEklundLoader } from './justin_eklund_loader.js';
-
+import { MercedesMathewsLoader } from './mercedes_mathews_loader.js';
 
 export const Loaders = Symbol.for('Loaders');
 
-const LOADER_PROVIDERS = [AnthonyMaysLoader, DylanLaffertysLoader,JustinEklundLoader];
+const LOADER_PROVIDERS = [AnthonyMaysLoader, DylanLaffertysLoader,JustinEklundLoader, MercedesMathewsLoader];
 
 @Module({
   providers: [
@@ -21,4 +21,4 @@ const LOADER_PROVIDERS = [AnthonyMaysLoader, DylanLaffertysLoader,JustinEklundLo
   exports: [Loaders],
 })
 export class LoadersModule {}
-// got assistance from ai and copilot aswell as Meiko ,Mercedes and Dillon
+// got assistance from ai and copilot aswell as Meiko ,Mercedes and Dillon