diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index e58db912cf4..7c410a4ab30 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -25525,24 +25525,14 @@
     "stability.stable-conservative-upscale-v1:0": {
         "litellm_provider": "bedrock",
         "max_input_tokens": 77,
-<<<<<<< HEAD
-        "mode": "image_edit",
-        "output_cost_per_image": 0.4
-=======
         "mode": "image_edits",
         "output_cost_per_image": 0.40
->>>>>>> b712575d64 (fix Updated all 27 occurrences of mode: image_edit to mode: image_edits)
     },
     "stability.stable-creative-upscale-v1:0": {
         "litellm_provider": "bedrock",
         "max_input_tokens": 77,
-<<<<<<< HEAD
-        "mode": "image_edit",
-        "output_cost_per_image": 0.6
-=======
         "mode": "image_edits",
         "output_cost_per_image": 0.60
->>>>>>> b712575d64 (fix Updated all 27 occurrences of mode: image_edit to mode: image_edits)
     },
     "stability.stable-fast-upscale-v1:0": {
         "litellm_provider": "bedrock",
@@ -33940,4 +33930,4 @@
         "litellm_provider": "llamagate",
         "mode": "embedding"
     }
-}
\ No newline at end of file
+}
diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index 52b41a464eb..7c410a4ab30 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -33930,4 +33930,4 @@
         "litellm_provider": "llamagate",
         "mode": "embedding"
     }
-}
\ No newline at end of file
+}