diff --git a/.gitignore b/.gitignore
index 5b9e276..94c29f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,13 +16,10 @@ uploads
 .venv
 __pycache__
 .claude
-<<<<<<< HEAD
 *.db
-=======
 .trae
 .agent
 .agents
->>>>>>> feat/database
 
 # Editor directories and files
 .vscode/*
@@ -34,7 +31,6 @@ __pycache__
 *.njsproj
 *.sln
 *.sw?
-<<<<<<< HEAD
 
 # Skills
 .skills
@@ -42,9 +38,7 @@ __pycache__
 .agents
 .trae
 skills-lock.json
-=======
 *.db
 server/data/*.db
 
-skills-lock.json
->>>>>>> feat/database
+tsconfig.tsbuildinfo
\ No newline at end of file
diff --git a/src/components/message/MessageBubble.vue b/src/components/message/MessageBubble.vue
index 54c4a7d..a5a9ea3 100644
--- a/src/components/message/MessageBubble.vue
+++ b/src/components/message/MessageBubble.vue
@@ -24,14 +24,14 @@
     <!-- 消息内容区域 -->
     <div class="message-content-wrapper">
       <!-- 角色名称 -->
-      <div class="message-header">
+      <!-- <div class="message-header">
         <span class="role-name">
           {{ message.role === "assistant" ? "AI 助手" : "你" }}
         </span>
         <span v-if="showTimestamp" class="timestamp">
           {{ formattedTime }}
         </span>
-      </div>
+      </div> -->
 
       <!-- 消息主体 -->
       <div class="message-body">
@@ -183,7 +183,7 @@
 
 <script setup lang="ts">
 import { useClipboard } from "@vueuse/core";
-import { ref, computed } from "vue";
+import { ref } from "vue";
 // 正确导入 markstream-vue
 import MarkdownRender from "markstream-vue";
 import { setCustomComponents } from "markstream-vue";
@@ -197,7 +197,7 @@ import {
   Play,
 } from "@/components/icons";
 import MessageActions from "./MessageActions.vue";
-import { formatTimestamp, formatFileSize, getFileIcon } from "@/utils/helpers";
+import { formatFileSize, getFileIcon } from "@/utils/helpers";
 import type { Message, Suggestion, Attachment, VideoInfo } from "@/types/chat";
 import ThinkingNode from "./components/ThinkingNode.vue";
 import EChartsContainerNode from "./components/EChartsContainerNode.vue";
@@ -229,10 +229,6 @@ const emit = defineEmits<{
 
 const isHovered = ref(false);
 
-const formattedTime = computed(() => {
-  return formatTimestamp(props.message.timestamp);
-});
-
 function getFileEmoji(mimeType?: string) {
   return getFileIcon(mimeType || "");
 }