fix(dev): fix merge conflicts

Author: tverney

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -134,14 +134,7 @@ export class FeatureDevClient {
         conversationId: string,
         uploadId: string,
         message: string,
-<<<<<<< HEAD
-<<<<<<< HEAD
         codeGenerationId: string,
-=======
->>>>>>> 4742b3c59 (refactor(amazonqFeatureDev): include updated rts model)
-=======
-        codeGenerationId: string,
->>>>>>> d9c61d527 (refactor(amazonqFeatureDev): add logic for codeGenerationId)
         currentCodeGenerationId?: string
     ) {
         try {