Fix merge issues

Author: MicroFish91

package.json

@@ -65,6 +65,16 @@
                 "category": "Azure Container Apps",
                 "icon": "$(add)"
             },
+            {
+                "command": "containerApps.deleteManagedEnvironment",
+                "title": "%containerApps.deleteManagedEnvironment%",
+                "category": "Azure Container Apps"
+            },
+            {
+                "command": "containerApps.editContainerApp",
+                "title": "%containerApps.editContainerApp%",
+                "category": "Azure Container Apps"
+            },
             {
                 "command": "containerApps.deployImage",
                 "title": "%containerApps.deployImage%",
@@ -76,11 +86,6 @@
                 "title": "%containerApps.deployImageApi%",
                 "category": "Azure Container Apps"
             },
-            {
-                "command": "containerApps.deleteManagedEnvironment",
-                "title": "%containerApps.deleteManagedEnvironment%",
-                "category": "Azure Container Apps"
-            },
             {
                 "command": "containerApps.deleteContainerApp",
                 "title": "%containerApps.deleteContainerApp%",
@@ -106,6 +111,12 @@
                 "title": "%containerApps.editTargetPort%",
                 "category": "Azure Container Apps"
             },
+            {
+                "command": "containerApps.discardRevisionDraft",
+                "title": "%containerApps.discardRevisionDraft%",
+                "category": "Azure Container Apps",
+                "icon": "$(discard)"
+            },
             {
                 "command": "containerApps.chooseRevisionMode",
                 "title": "%containerApps.chooseRevisionMode%",
@@ -215,24 +226,39 @@
                     "group": "2@2"
                 },
                 {
-                    "command": "containerApps.deployImage",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
-                    "group": "3@1"
+                    "command": "containerApps.discardRevisionDraft",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single(.*)unsavedChanges:true/i",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "containerApps.discardRevisionDraft",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single(.*)unsavedChanges:true/i",
+                    "group": "3@2"
+                },
+                {
+                    "command": "containerApps.editContainerApp",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single/i",
+                    "group": "4@1"
                 },
                 {
                     "command": "containerApps.deleteContainerApp",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
-                    "group": "3@2"
+                    "group": "5@1"
+                },
+                {
+                    "command": "containerApps.deployImage",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
+                    "group": "6@1"
                 },
                 {
                     "command": "containerApps.startStreamingLogs",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
-                    "group": "4@1"
+                    "group": "7@1"
                 },
                 {
                     "command": "containerApps.stopStreamingLogs",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
-                    "group": "4@2"
+                    "group": "7@2"
                 },
                 {
                     "command": "containerApps.chooseRevisionMode",