diff --git a/json-rpc/spec.json b/json-rpc/spec.json
index fcedf1cfde..1a19d6f97d 100644
--- a/json-rpc/spec.json
+++ b/json-rpc/spec.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	"openrpc": "1.0.0",
 	"info": {
 		"version": "1.0.10",
@@ -196,14 +197,6 @@
 				"$ref": "#/components/contentDescriptors/GasPrice"
 			}
 		},
-		{
-			"name": "eth_maxFeePerGas",
-			"summary": "Returns a maxFeePerGas value suitable for quick transaction inclusion",
-			"params": [],
-			"result": {
-				"$ref": "#/components/contentDescriptors/MaxFeePerGas"
-			}
-		},
 		{
 			"name": "eth_maxPriorityFeePerGas",
 			"summary": "Returns a maxPriorityFeePerGas value suitable for quick transaction inclusion",
@@ -1776,15 +1769,6 @@
 					"$ref": "#/components/schemas/Integer"
 				}
 			},
-			"MaxFeePerGas": {
-				"name": "maxFeePerGas",
-				"required": true,
-				"schema": {
-					"title": "maxFeeCapPerGas",
-					"description": "Integer of the max fee per gas",
-					"$ref": "#/components/schemas/Integer256"
-				}
-			},
 			"MaxPriorityFeePerGas": {
 				"name": "maxPriorityFeePerGas",
 				"required": true,