diff --git a/.claude/launch.json b/.claude/launch.json
index a7bd0a5..eb61e05 100644
--- a/.claude/launch.json
+++ b/.claude/launch.json
@@ -3,11 +3,7 @@
   "configurations": [
     {
       "name": "static-site",
-<<<<<<< HEAD
-      "runtimeExecutable": "C:\\Users\\justi\\AppData\\Local\\Programs\\Python\\Python312\\python.exe",
-=======
       "runtimeExecutable": "python",
->>>>>>> 6cea0312d23f660964b44ad3b2a6f18619d0b10b
       "runtimeArgs": ["-m", "http.server", "8123"],
       "port": 8123
     }
diff --git a/_headers b/_headers
index c9a8bbf..a50737a 100644
--- a/_headers
+++ b/_headers
@@ -1,13 +1,5 @@
 /*
-<<<<<<< HEAD
-<<<<<<< HEAD
   Content-Security-Policy: default-src 'self'; script-src 'self' https://static.cloudflareinsights.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' data:; connect-src 'self' https://cloudflareinsights.com; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests
-=======
-  Content-Security-Policy: default-src 'self'; script-src 'self' https://static.cloudflareinsights.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' https://ki5bhv.com data:; connect-src 'self' https://cloudflareinsights.com; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests
->>>>>>> c7a10ae71906680d14e62b25c702ac21e5067a7f
-=======
-  Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' https://static.cloudflareinsights.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' https://ki5bhv.com data:; connect-src 'self' https://cloudflareinsights.com; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests
->>>>>>> 6cea0312d23f660964b44ad3b2a6f18619d0b10b
   X-Content-Type-Options: nosniff
   X-Frame-Options: DENY
   Referrer-Policy: strict-origin-when-cross-origin
diff --git a/index.html b/index.html
index 77de342..0ffd26d 100644
--- a/index.html
+++ b/index.html
@@ -6,16 +6,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="referrer" content="strict-origin-when-cross-origin" />
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <meta http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self' https://static.cloudflareinsights.com; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' data:; connect-src 'self' https://cloudflareinsights.com; frame-src 'none'; object-src 'none'; base-uri 'self'; form-action 'self'; upgrade-insecure-requests" />
-=======
->>>>>>> c7a10ae71906680d14e62b25c702ac21e5067a7f
-=======
-  <meta http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self' 'unsafe-inline' https://static.cloudflareinsights.com; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' https://ki5bhv.com data:; connect-src 'self' https://cloudflareinsights.com; frame-src 'none'; object-src 'none'; base-uri 'self'; form-action 'none'; upgrade-insecure-requests" />
->>>>>>> 6cea0312d23f660964b44ad3b2a6f18619d0b10b
   <title>Justin Frasier | Infrastructure Administrator</title>
   <link rel="sitemap" type="application/xml" href="/sitemap.xml" />
   <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' rx='4' fill='%230f1218'/%3E%3Ctext x='3' y='11' font-family='IBM Plex Mono,Courier New,monospace' font-size='6' fill='%234a5568'%3E~$%3C/text%3E%3Ctext x='2' y='27' font-family='IBM Plex Mono,Courier New,monospace' font-size='19' font-weight='600' fill='%2322c55e'%3Ejf%3C/text%3E%3C/svg%3E" />
@@ -34,11 +24,7 @@
 
     <!-- ── Sidebar ── -->
     <aside>
-<<<<<<< HEAD
       <img class="profile-photo" src="./photo/justin1.jpg" alt="Justin Frasier">
-=======
-      <img class="profile-photo" src="https://ki5bhv.com/photo/justin1.jpg" alt="Justin Frasier">
->>>>>>> c7a10ae71906680d14e62b25c702ac21e5067a7f
       <div class="profile-name">Justin Frasier</div>
       <div class="profile-title">Infrastructure Administrator</div>
       <div class="profile-loc">📍 Bossier City, LA</div>