diff --git a/.changeset/nasty-pots-cheer.md b/.changeset/nasty-pots-cheer.md
new file mode 100644
index 00000000..54261787
--- /dev/null
+++ b/.changeset/nasty-pots-cheer.md
@@ -0,0 +1,5 @@
+---
+'@openzeppelin/relayer-sdk': minor
+---
+
+fear: stellar gas abstraction
diff --git a/src/models/plugin-api.ts b/src/models/plugin-api.ts
index 0b74b537..a3df9723 100644
--- a/src/models/plugin-api.ts
+++ b/src/models/plugin-api.ts
@@ -196,11 +196,8 @@ export type PluginHeaders = Record<string, string[]>;
 export interface PluginContext {
   api: PluginAPI;
   kv: PluginKVStore;
-<<<<<<< HEAD
-=======
   headers: PluginHeaders;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
->>>>>>> main
   params: any;
 }