diff --git a/src/lib/providers/anthropic.ts b/src/lib/providers/anthropic.ts
index e74bcee..8595dbf 100644
--- a/src/lib/providers/anthropic.ts
+++ b/src/lib/providers/anthropic.ts
@@ -155,4 +155,8 @@ async function testRetryLogic(): Promise<void> {
 }
 
 // Uncomment the following line to run the test
-// testRetryLogic();
\ No newline at end of file
+<<<<<<< HEAD
+// testRetryLogic();
+=======
+// testRetryLogic();
+>>>>>>> 2898775c6fc98f810ae96556fecfc20cf892fc3c