diff --git a/index.html b/index.html
index c9d8fa8..bbb07db 100644
--- a/index.html
+++ b/index.html
@@ -309,6 +309,9 @@
             ) {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> parent of 97f3a78 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
                 fumble();
                 return;
             }
@@ -338,6 +341,7 @@
                     </div>
                 `;
                 document.body.appendChild(httpModal);
+<<<<<<< HEAD
 =======
               // Show blocked content modal
               const blockedModal = document.getElementById('blockedModal');
@@ -366,6 +370,8 @@
             // Can't access title due to CORS - assume page is OK
           }
 >>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
+=======
+>>>>>>> parent of 97f3a78 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
 
                 // Handle button clicks
                 const openBtn = httpModal.querySelector('.http-open-btn');
diff --git a/styles.css b/styles.css
index e0e6355..f9ce2bd 100644
--- a/styles.css
+++ b/styles.css
@@ -912,29 +912,17 @@ main:hover .floating-button {
 <<<<<<< HEAD
 }
 
-<<<<<<< HEAD
 .http-modal .modal-content {
     max-width: 400px;
 }
 
 .http-modal-buttons {
-=======
-.blocked-modal .modal-content {
-    max-width: 400px;
-}
-
-.blocked-modal-buttons {
->>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     display: flex;
     gap: 10px;
     margin-top: 20px;
 }
 
-<<<<<<< HEAD
 .http-open-btn, .http-skip-btn {
-=======
-.blocked-retry-btn, .blocked-open-btn {
->>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     flex: 1;
     padding: 12px;
     border: none;
@@ -945,16 +933,11 @@ main:hover .floating-button {
     transition: background-color 0.3s ease;
 }
 
-<<<<<<< HEAD
 .http-open-btn {
-=======
-.blocked-retry-btn {
->>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #ff4500;
     color: white;
 }
 
-<<<<<<< HEAD
 .dark-mode .http-open-btn {
     background-color: #ff6b4a;
 }
@@ -964,35 +947,16 @@ main:hover .floating-button {
 }
 
 .http-skip-btn {
-=======
-.dark-mode .blocked-retry-btn {
-    background-color: #ff6b4a;
-}
-
-.blocked-retry-btn:hover {
-    background-color: #ff5722;
-}
-
-.blocked-open-btn {
->>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #f0f0f0;
     color: #333;
 }
 
-<<<<<<< HEAD
 .dark-mode .http-skip-btn {
-=======
-.dark-mode .blocked-open-btn {
->>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #2a2a2a;
     color: #fff;
 }
 
-<<<<<<< HEAD
 .http-skip-btn:hover {
-=======
-.blocked-open-btn:hover {
->>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #e0e0e0;
 =======
 >>>>>>> b6825be (Revert "Reverted back to 4cd4110 before changes were made to monitoring. Trying")