diff --git a/views/index.ejs b/views/index.ejs
index ed90e493204a4375c6c48f0dedcd844aaeeda01a..523d5151f6591cd6aa11dcbc171d127365218981 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -35,8 +35,13 @@
       <!--header section start -->
       <div class="header_section">
          
+<<<<<<< HEAD
             <nav class="navbar navbar-light" style="background-color:  #343a40;">
                <div class="logo"><a href="/"><h1 style="color: rgb(255, 255, 255);" class="h1">ASA SHOP</h1></a></div>
+=======
+            <nav class="navbar navbar-light" style="background-color: #e3f2fd;">
+               <div class="logo"><a href="/"><h1 style="color: rgb(248, 113, 3);" class="h1">ASA SHOP</h1></a></div>
+>>>>>>> 3957e9726da83e8c8283ea5a771c09c9e8b11155
                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav"aria-expanded="false" aria-label="Toggle navigation">
                <span class="navbar-toggler-icon"></span>
                </button>
diff --git a/views/product.ejs b/views/product.ejs
index 7c3799fc5da2b220b0ac7c145e331f38b0ab150f..e3f39dbf7805f726f7141ddbd63c2511e4642571 100644
--- a/views/product.ejs
+++ b/views/product.ejs
@@ -6,6 +6,7 @@
     <title><%= product.product_name %> | ASA SHOP</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet">
     <style>
+<<<<<<< HEAD
         body {
             font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
             background-color: #f8f9fa;
@@ -31,10 +32,121 @@
             border-radius: 8px;
             padding: 10px 20px;
         }
+=======
+/* --- Background และตัวอักษร --- */
+body {
+    background-color: #ffffff;
+    color: #000000;
+    font-family: Arial, sans-serif;
+}
+
+/* --- Container --- */
+.container {
+    max-width: 800px;
+    margin-top: 50px;
+    background: #e3f2fd;
+    padding: 24px;
+    border-radius: 12px;
+    box-shadow: 0 6px 12px rgba(255, 165, 0, 0.15);
+    transition: transform 0.2s ease, box-shadow 0.2s ease;
+}
+
+.container:hover {
+    transform: translateY(-4px);
+    box-shadow: 0 12px 24px rgba(255, 165, 0, 0.25);
+}
+
+/* --- Product Image --- */
+.product-image {
+    max-width: 100%;
+    border-radius: 12px;
+    object-fit: cover;
+    transition: transform 0.2s ease;
+}
+
+.product-image:hover {
+    transform: scale(1.03);
+}
+
+/* --- ปุ่ม Orange --- */
+.btn-orange {
+    background-color: #fff0e1;
+    color: rgb(10, 10, 10);
+    border: none;
+    padding: 10px 18px;
+    border-radius: 8px;
+    font-size: 16px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: background-color 0.2s ease, transform 0.1s ease;
+    box-shadow: 0 4px 8px rgba(255, 102, 0, 0.3);
+}
+
+.btn-orange:hover {
+    background-color: #cc5200;
+    transform: translateY(-2px);
+    box-shadow: 0 6px 12px rgba(255, 102, 0, 0.4);
+}
+
+.btn-orange:active {
+    background-color: #b34700;
+    transform: translateY(0);
+}
+
+/* --- ปุ่ม Yellow --- */
+.btn-yellow {
+    background-color: #ffcc00;
+    color: black;
+    padding: 10px 18px;
+    border-radius: 8px;
+    font-size: 16px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: background-color 0.2s ease, transform 0.1s ease;
+    box-shadow: 0 4px 8px rgba(255, 204, 0, 0.3);
+}
+
+.btn-yellow:hover {
+    background-color: #e6b800;
+    transform: translateY(-2px);
+    box-shadow: 0 6px 12px rgba(255, 204, 0, 0.4);
+}
+
+.btn-yellow:active {
+    background-color: #cca300;
+    transform: translateY(0);
+}
+
+/* --- ปุ่ม Danger --- */
+.btn-danger {
+    background-color: #ff4d4d;
+    color: white;
+    padding: 10px 18px;
+    border-radius: 8px;
+    font-size: 16px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: background-color 0.2s ease, transform 0.1s ease;
+    box-shadow: 0 4px 8px rgba(255, 77, 77, 0.3);
+}
+
+.btn-danger:hover {
+    background-color: #e60000;
+    transform: translateY(-2px);
+    box-shadow: 0 6px 12px rgba(255, 77, 77, 0.4);
+}
+
+.btn-danger:active {
+    background-color: #cc0000;
+    transform: translateY(0);
+}
+
+>>>>>>> 3957e9726da83e8c8283ea5a771c09c9e8b11155
     </style>
 </head>
 <body>
 
+<<<<<<< HEAD
 <nav class="navbar navbar-expand-lg">
     <div class="container">
         <a class="navbar-brand" href="/">ASA SHOP</a>
@@ -52,6 +164,23 @@
                     <li class="nav-item"><a class="nav-link" href="/login">เข้าสู่ระบบ</a></li>
                 <% } %>
             </ul>
+=======
+<div class="container text-center">
+    <h1 class="mb-3"><%= product.product_name %></h1>
+    <img src="<%= product.image %>" alt="<%= product.product_name %>" class="product-image mb-3">
+    <p><strong>ราคา:</strong> <span class="text-primary"><%= product.price %> บาท</span></p>
+    <p><strong>รายละเอียด:</strong> <%= product.description || "ไม่มีรายละเอียด" %></p>
+    <p><strong>สร้างโดย:</strong> <%= product.owner %></p>
+
+    <% if (currentUserEmail === product.owner) { %>
+        <div class="d-flex justify-content-center gap-2">
+            <form action="/delete_product/<%= product.product_id %>" method="POST" onsubmit="return confirm('ยืนยันการลบสินค้านี้?');">
+                <button type="submit" class="btn btn-danger">ลบสินค้า</button>
+            </form>
+            <form action="/products/<%= product.product_id %>/edit" method="GET">
+                <button type="submit" class="btn btn-yellow">แก้ไขสินค้า</button>
+            </form>
+>>>>>>> 3957e9726da83e8c8283ea5a771c09c9e8b11155
         </div>
     </div>
 </nav>