User_List CSS file merge issue solved

static/user_list_styles.css

-<<<<<<< HEAD
 body, heading, list {
     margin: 0; /* remove default margin */
     padding: 0; /* remove default padding */
@@ -145,70 +144,4 @@ main a, main a:visited {
 
 .user-details tr:hover {
     background-color: #f5f5f5; /* hover effect */
-=======
-/* styles.css */
-body {
-    font-family: Arial, sans-serif;
-    background-color: #f7f7f7;
-}
-
-.site-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10px 20px;
-    background-color: #323f48;
-    color: white;
-}
-
-.site-header .logo {
-    height: 50px; /* Adjust size as needed */
-}
-
-nav a {
-    text-decoration: none;
-    color: white;
-    padding: 0 15px;
-}
-
-nav a:hover {
-    text-decoration: underline;
-}
-
-@media (max-width: 600px) {
-    .site-header {
-        flex-direction: column;
-    }
-    .site-header .logo {
-        margin-bottom: 10px;
-    }
-    nav a {
-        display: block;
-        text-align: center;
-    }
-}
-
-#confirmation {
-    max-width: 600px;
-    margin: 2em auto;
-    padding: 2em;
-    background-color: white;
-    border-radius: 5px;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
-
-h1 {
-    color: #333;
-    text-align: center;
-}
-
-p {
-    font-size: 1em;
-    line-height: 1.5;
-    color: #666;
-}
-
-strong {
-    color: #333;
->>>>>>> 0c0195639191e2624ce3f84a0b434578d8d91fa6
 }