merge conflict fixups

Author: emily-shen

packages/wrangler/src/__tests__/cloudchamber/apply.test.ts

@@ -296,7 +296,6 @@ describe("cloudchamber apply", () => {
 			│
 			│  SUCCESS  Modified application my-container-app
 			│
-			│
 			│  SUCCESS  Created application my-container-app-2 (Application ID: abc)
 			│
 			╰ Applied changes
@@ -469,7 +468,6 @@ describe("cloudchamber apply", () => {
 			│
 			│  SUCCESS  Modified application my-container-app
 			│
-			│
 			│  SUCCESS  Created application my-container-app-2 (Application ID: abc)
 			│
 			╰ Applied changes
@@ -1009,9 +1007,11 @@ describe("cloudchamber apply", () => {
 			│
 			│ + [containers.configuration.observability.logs]
 			│ + enabled = true
+			│ +
+			│ +
+			│     [containers.constraints]
+			│     tier = 1
 			│
-			│   [containers.constraints]
-			│   ...
 			│
 			│  SUCCESS  Modified application my-container-app
 			│
@@ -1077,9 +1077,11 @@ describe("cloudchamber apply", () => {
 			│
 			│ + [containers.configuration.observability.logs]
 			│ + enabled = true
+			│ +
+			│ +
+			│     [containers.constraints]
+			│     tier = 1
 			│
-			│   [containers.constraints]
-			│   ...
 			│
 			│  SUCCESS  Modified application my-container-app
 			│