fixed merge conflicts

SerpentRace_Backend/src/Application/Game/commands/GenerateBoardCommandHandler.ts

@@ -37,11 +37,7 @@ export class GenerateBoardCommandHandler {
             );
 
             const executionTime = Date.now() - startTime;
-<<<<<<< HEAD
             logOther(`Board generation completed for game ${cmd.gameId} in ${executionTime}ms using pattern-based approach`);
-=======
-            logOther(`Board generation completed for game ${cmd.gameId} in ${executionTime}ms. Error rate: ${boardData.totalErrorRate}%`);
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 
         } catch (error) {
             logError(`Board generation failed for game ${cmd.gameId}:`, error as Error);
@@ -50,12 +46,6 @@ export class GenerateBoardCommandHandler {
             const errorData: BoardData = {
                 gameId: cmd.gameId,
                 fields: [],
-<<<<<<< HEAD
-=======
-                border: [],
-                validationResults: {},
-                totalErrorRate: 100,
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
                 generationComplete: false,
                 error: error instanceof Error ? error.message : 'Unknown error',
                 generatedAt: new Date()