diff --git a/frontend-interface/components/DragAndDropGrid.js b/frontend-interface/components/DragAndDropGrid.js
index dc286b0d..68a6524f 100644
--- a/frontend-interface/components/DragAndDropGrid.js
+++ b/frontend-interface/components/DragAndDropGrid.js
@@ -273,7 +273,7 @@ export default function DragAndDropGrid() {
 
     return (
         <div style={{ backgroundColor: '#fff', minHeight: '100vh', color: 'black' }}>
-            {/* Title Section */}
+            {/* Title */}
             <div style={{
                 padding: '40px 20px',
                 textAlign: 'center',
diff --git a/frontend-interface/components/__tests__/NoiseModel.test.js b/frontend-interface/components/__tests__/NoiseModel.test.js
index 561ccf90..4281658c 100644
--- a/frontend-interface/components/__tests__/NoiseModel.test.js
+++ b/frontend-interface/components/__tests__/NoiseModel.test.js
@@ -1,11 +1,7 @@
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
-<<<<<<< HEAD
 import NoiseModel from '../NoiseModel.js';
-=======
-import NoiseModel from '../NoiseModel';
->>>>>>> 32e2a8731673b696e6d9ae61d7c53941aac04b1d
 import fetchMock from 'jest-fetch-mock';
 
 fetchMock.enableMocks();