diff --git a/computers.html b/computers.html
index aa1f054d..3c521aa5 100644
--- a/computers.html
+++ b/computers.html
@@ -33,17 +33,8 @@
       <a href="images/photos/full/mainpc_open_full.jpg" class="link-image">
         <img src="images/photos/mainpc_open.jpg" alt="an open computer" width="256" height="192 ">
       </a>
-<<<<<<< Updated upstream
-      <figcaption>My main pc. It's been upgraded to a ryzen 5 7600 from a ryzen 5 3600. It's got an rx 5700xt and 32gb of ddr5. I run endeavoros.
-=======
-<<<<<<< HEAD
       <figcaption>My main pc. It's been upgraded to a ryzen 5 7600 from a ryzen 5 3600. It's got an rx 5700xt and 32gb
       of ddr5. I run endeavoros.
-=======
-      <figcaption>My main pc. It's been upgraded to a ryzen 5 7600 from a ryzen 5 3600. It's got an rx 5700xt and 32gb of ddr5. I run endeavoros.
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
-      </figcaption>
     </figure>
 
     <h2>pentium iii system</h2>
@@ -90,16 +81,8 @@
       <a href="images/photos/full/macpro-desktop_full.jpg" class="link-image">
         <img src="images/photos/macpro-desktop.jpg" alt="mac pro showing the desktop" width="256" height="192">
       </a> -->
-<<<<<<< Updated upstream
-      <figcaption>Planned to be my new nas, transferred from the 09 mac pro. Haven't gotten around to it yet. It has a xeon w-2135, which is a 6 core skylake chip. I gave it 32gb of ddr4 and 2 4tb hard drives. 
-=======
-<<<<<<< HEAD
       <figcaption>Planned to be my new nas, transferred from the 09 mac pro. Haven't gotten around to it yet. It has a
       xeon w-2135, which is a 6 core skylake chip. I gave it 32gb of ddr4 and 2 4tb hard drives.
-=======
-      <figcaption>Planned to be my new nas, transferred from the 09 mac pro. Haven't gotten around to it yet. It has a xeon w-2135, which is a 6 core skylake chip. I gave it 32gb of ddr4 and 2 4tb hard drives. 
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
       </figcaption>
     </figure>
 
@@ -130,16 +113,8 @@
       <!-- <a href="images/photos/full/powerbook_full.jpg" class="link-image">
         <img src="images/photos/powerbook.jpg" alt="powerbook" width="196" height="256">
       </a> -->
-<<<<<<< Updated upstream
-      <figcaption>a quicksilver model, it has a powerpc g4, some ram, and a cool scsi card. I haven't really been able to get this machine working.
-=======
-<<<<<<< HEAD
       <figcaption>a quicksilver model, it has a powerpc g4, some ram, and a cool scsi card. I haven't really been able
       to get this machine working.
-=======
-      <figcaption>a quicksilver model, it has a powerpc g4, some ram, and a cool scsi card. I haven't really been able to get this machine working.
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
       </figcaption>
     </figure>
 
@@ -168,16 +143,8 @@
       <a href="images/photos/full/t400_full.jpg" class="link-image">
         <img src="images/photos/t400.jpg" alt="thinkpad" width="196" height="256">
       </a> -->
-<<<<<<< Updated upstream
-      <figcaption>Looks like every early to mid thousands office dell. I don't even remember the model number. I slapped a xfx 7800gs in it for winxp gaming. Haven't used it much yet.
-=======
-<<<<<<< HEAD
       <figcaption>Looks like every early to mid thousands office dell. I don't even remember the model number. I
       slapped a xfx 7800gs in it for winxp gaming. Haven't used it much yet.
-=======
-      <figcaption>Looks like every early to mid thousands office dell. I don't even remember the model number. I slapped a xfx 7800gs in it for winxp gaming. Haven't used it much yet.
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
       </figcaption>
     </figure>
 
@@ -208,16 +175,8 @@
       <a href="images/photos/full/macplus_full.jpg" class="link-image">
         <img src="images/photos/macplus.jpg" alt="mac plus" width="196" height="256">
       </a> -->
-<<<<<<< Updated upstream
-      <figcaption>I got a lot of compact macs, pluses and ses and stuff. Sold a lot of em off, and scrapped the unfixable ones.
-=======
-<<<<<<< HEAD
       <figcaption>I got a lot of compact macs, pluses and ses and stuff. Sold a lot of em off, and scrapped the
       unfixable ones.
-=======
-      <figcaption>I got a lot of compact macs, pluses and ses and stuff. Sold a lot of em off, and scrapped the unfixable ones.
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
       </figcaption>
     </figure>
 
@@ -245,15 +204,7 @@
     <footer>    
         <a href="/">back home</a>
 
-<<<<<<< Updated upstream
-        <p><i>Updated September 13th, 2024</i></p>
-=======
-<<<<<<< HEAD
         <p><i>Updated October 4th, 2024</i></p>
-=======
-        <p><i>Updated September 13th, 2024</i></p>
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
     </footer>
   </body>
 </html>
diff --git a/index.html b/index.html
index fd878ebe..c6a05844 100644
--- a/index.html
+++ b/index.html
@@ -16,10 +16,11 @@
   <body>
     <h1>welcome to amber's place~</h1>
     
-    <a href="images/pfp.png" class="link-image"><img src="images/pfp_256.png" alt="a picrew profile picture of a girl with pink hair and 
-      glasses next to a cat. the girl has a speech bubble with the lesbian flag in it." width="256" height="256"></a>
+    <a href="images/pfp.png" class="link-image"><img src="images/pfp_256.png" alt="a picrew profile picture of a girl
+    with pink hair and glasses next to a cat. the girl has a speech bubble with the lesbian flag in it."
+    width="256" height="256"></a>
 
-    <p>i'm tired of this overly corporate internet. its falling apart at the seams. boy billionaires burn it to the ground. thats why 
+    <p>i'm tired of this overly corporate internet. its falling apart at the seams. thats why
       this site exists as a sanctuary away from an increasingly exploitative web.</p>
     
     <nav>
diff --git a/news.html b/news.html
index 267e6505..cf68a7f5 100644
--- a/news.html
+++ b/news.html
@@ -9,9 +9,6 @@
   <body>
     <h1>news</h1>
     <article>
-<<<<<<< Updated upstream
-=======
-<<<<<<< HEAD
       <h1>Hello.</h1>
 
       <p><i>October 4th, 2024</i></p>
@@ -32,25 +29,14 @@
       <p>Sorry for the sad article, but it reflects how I'm feeling these days. I love y'all. Stay safe.</p>
     </article>
     <article>
-=======
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
       <h1>Hi!</h1>
 
       <p><i>September 13th, 2024</i></p>
 
       <p>"Holy shit, an update that didn't take 3 months" - ambersplace viewer </p>
       
-<<<<<<< Updated upstream
-      <p>I updated the computers page. I'll be adding images soon. At some point I'll be updating the minidisc page, my collection has grown substantially.</p>
-=======
-<<<<<<< HEAD
       <p>I updated the computers page. I'll be adding images soon. At some point I'll be updating the minidisc page,
       my collection has grown substantially.</p>
-=======
-      <p>I updated the computers page. I'll be adding images soon. At some point I'll be updating the minidisc page, my collection has grown substantially.</p>
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
 
       <p>Hope you're doing well.</p>
     </article>
@@ -165,15 +151,7 @@
     <footer>    
         <a href="/">back home</a>
 
-<<<<<<< Updated upstream
-        <p><i>Updated September 13th, 2024</i></p>
-=======
-<<<<<<< HEAD
         <p><i>Updated October 4th, 2024</i></p>
-=======
-        <p><i>Updated September 13th, 2024</i></p>
->>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
->>>>>>> Stashed changes
     </footer>
   </body>
 </html>