diff --git a/src/app/[handle]/[collection]/[rkey]/page.tsx b/src/app/[handle]/[collection]/[rkey]/page.tsx
index 39518ab..473c7dc 100644
--- a/src/app/[handle]/[collection]/[rkey]/page.tsx
+++ b/src/app/[handle]/[collection]/[rkey]/page.tsx
@@ -281,13 +281,8 @@ async function RecordContent({ handle, collection, rkey }: { handle: string; col
     
     if (!resolvedDid) {
       return (
-        <div className="container-narrow" style={{ padding: '2rem 2rem 4rem', textAlign: 'center' }}>
+        <>
           <Header compact />
-<<<<<<< Updated upstream
-          <h1 style={{ marginBottom: '1rem', color: 'var(--text-primary)' }}>Error</h1>
-          <p style={{ color: 'var(--text-secondary)' }}>Could not resolve handle: {handle}</p>
-        </div>
-=======
           <div className="container-narrow" style={{ padding: '0 2rem 4rem' }}>
             <NotFoundPanel
               eyebrow="Couldn't resolve"
@@ -297,7 +292,6 @@ async function RecordContent({ handle, collection, rkey }: { handle: string; col
             />
           </div>
         </>
->>>>>>> Stashed changes
       );
     }
 
diff --git a/src/app/[handle]/page.tsx b/src/app/[handle]/page.tsx
index dc08955..364735e 100644
--- a/src/app/[handle]/page.tsx
+++ b/src/app/[handle]/page.tsx
@@ -87,13 +87,8 @@ async function ProfileContent({ handle }: { handle: string }) {
   
   if (!resolvedDid) {
     return (
-      <div className="container-narrow" style={{ padding: '2rem 2rem 4rem', textAlign: 'center' }}>
+      <>
         <Header compact />
-<<<<<<< Updated upstream
-        <h1 style={{ marginBottom: '1rem', color: 'var(--text-primary)' }}>Error</h1>
-        <p style={{ color: 'var(--text-secondary)' }}>Could not resolve handle</p>
-      </div>
-=======
         <div className="container-narrow" style={{ padding: '0 2rem 4rem' }}>
           <NotFoundPanel
             eyebrow="Couldn't resolve"
@@ -103,7 +98,6 @@ async function ProfileContent({ handle }: { handle: string }) {
           />
         </div>
       </>
->>>>>>> Stashed changes
     );
   }
 
diff --git a/src/app/profile/[handle]/post/[rkey]/page.tsx b/src/app/profile/[handle]/post/[rkey]/page.tsx
index eb9201c..e5a88fa 100644
--- a/src/app/profile/[handle]/post/[rkey]/page.tsx
+++ b/src/app/profile/[handle]/post/[rkey]/page.tsx
@@ -167,13 +167,8 @@ async function PostContent({ handle, rkey }: { handle: string; rkey: string }) {
     
     if (!resolvedDid) {
       return (
-        <div className="container-narrow" style={{ padding: '2rem 2rem 4rem', textAlign: 'center' }}>
+        <>
           <Header compact />
-<<<<<<< Updated upstream
-          <h1 style={{ marginBottom: '1rem', color: 'var(--text-primary)' }}>Error</h1>
-          <p style={{ color: 'var(--text-secondary)' }}>Could not resolve handle: {handle}</p>
-        </div>
-=======
           <div className="container-narrow" style={{ padding: '0 2rem 4rem' }}>
             <NotFoundPanel
               eyebrow="Couldn't resolve"
@@ -183,7 +178,6 @@ async function PostContent({ handle, rkey }: { handle: string; rkey: string }) {
             />
           </div>
         </>
->>>>>>> Stashed changes
       );
     }