Removed merge conflicts

Author: ashishrp-aws

packages/core/src/codewhispererChat/storages/chatHistory.ts

@@ -64,16 +64,7 @@ export class ChatHistoryManager {
      * Append a new user message to be sent
      */
     public appendUserMessage(newMessage: ChatMessage): void {
-        this.lastUserMessage = {
-            userInputMessage: {
-                content: newMessage.userInputMessage?.content ?? '',
-                userIntent: newMessage.userInputMessage?.userIntent ?? undefined,
-                userInputMessageContext: newMessage.userInputMessage?.userInputMessageContext ?? {
-                    tools: this.tools,
-                },
-                origin: newMessage.userInputMessage?.origin ?? undefined,
-            },
-        }
+        this.lastUserMessage = newMessage
         this.fixHistory()
         if (!newMessage.userInputMessage?.content || newMessage.userInputMessage?.content.trim() === '') {
             this.logger.warn('input must not be empty when adding new messages')

packages/core/src/shared/utilities/workspaceUtils.ts

@@ -674,7 +674,6 @@ export async function findStringInDirectory(searchStr: string, dirPath: string)
 
 /**
  * Returns a one-character tag for a directory ('d'), symlink ('l'), or file ('-').
- *
  */
 export function formatListing(name: string, fileType: vscode.FileType, fullPath: string): string {
     let typeChar = '-'