From f901d8feff0192d06742f6b5bf20c100d903d565 Mon Sep 17 00:00:00 2001
From: Edina Kurdi <edina.kurdi@gmail.com>
Date: Sat, 25 Jul 2026 11:39:09 +0100
Subject: [PATCH 1/2] dadd decrement, unskip decrement test

---
 dom-merge-conflict/tasks/buttons-and-counter/src/app.js     | 1 +
 .../tasks/buttons-and-counter/test/app.test.js              | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
index af608eb..ace9a7b 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
@@ -11,6 +11,7 @@ export function App() {
   header.innerHTML = `
         <h1>Number Counter</h1>
         <p>A simple counter. Press increment to increase the count by one.</p>
+        <button id="decrement">Decrement</button>
     `;
   body.appendChild(header);
 
diff --git a/dom-merge-conflict/tasks/buttons-and-counter/test/app.test.js b/dom-merge-conflict/tasks/buttons-and-counter/test/app.test.js
index 1139e45..451f7cd 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/test/app.test.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/test/app.test.js
@@ -17,7 +17,7 @@ describe("button and counter", () => {
 
   test("contains description paragraph with mention of 'increment' in header", () => {
     expect(
-      container.querySelector("header").querySelector("p")
+      container.querySelector("header").querySelector("p"),
     ).toHaveTextContent(/increment/i);
   });
 
@@ -35,7 +35,7 @@ describe("button and counter", () => {
     expect(getByTestId(container, "counter")).toHaveTextContent(/^2$/);
   });
 
-  describe.skip("decrement button", () => {
+  describe("decrement button", () => {
     test("pressing Decrement decreases the counter", () => {
       const button = getByRole(container, "button", {
         name: "Decrement",
@@ -49,7 +49,7 @@ describe("button and counter", () => {
 
     test("contains description paragraph with mention of 'decrement' in header", () => {
       expect(
-        container.querySelector("header").querySelector("p")
+        container.querySelector("header").querySelector("p"),
       ).toHaveTextContent(/decrement/i);
     });
   });

From ac6ce7d5ca8f55050bb2038f8426a3af25108290 Mon Sep 17 00:00:00 2001
From: dona-shehu <shehu.donna@gmail.com>
Date: Sat, 25 Jul 2026 11:40:21 +0100
Subject: [PATCH 2/2] adding the changed files

---
 .../tasks/buttons-and-counter/src/app.js           | 14 --------------
 .../tasks/buttons-and-counter/src/header.js        |  6 ++++++
 .../tasks/buttons-and-counter/src/main.js          |  6 ++++++
 3 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 dom-merge-conflict/tasks/buttons-and-counter/src/header.js
 create mode 100644 dom-merge-conflict/tasks/buttons-and-counter/src/main.js

diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
index af608eb..32dc0b4 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
@@ -7,20 +7,6 @@ function increment(node) {
 export function App() {
   const body = document.createElement("body");
 
-  const header = document.createElement("header");
-  header.innerHTML = `
-        <h1>Number Counter</h1>
-        <p>A simple counter. Press increment to increase the count by one.</p>
-    `;
-  body.appendChild(header);
-
-  const main = document.createElement("main");
-  main.innerHTML = `
-        <p id="counter" data-testid="counter">0</p>
-        <button id="increment">Increment</button>
-    `;
-  body.appendChild(main);
-
   const button = body.querySelector("#increment");
   const counter = body.querySelector("#counter");
   button.addEventListener("click", () => {
diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/header.js b/dom-merge-conflict/tasks/buttons-and-counter/src/header.js
new file mode 100644
index 0000000..0f0be02
--- /dev/null
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/header.js
@@ -0,0 +1,6 @@
+const header = document.createElement("header");
+header.innerHTML = `
+        <h1>Number Counter</h1>
+        <p>A simple counter. Press increment to increase the count by one.</p>
+    `;
+body.appendChild(header);
diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/main.js b/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
new file mode 100644
index 0000000..23ffe50
--- /dev/null
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
@@ -0,0 +1,6 @@
+const main = document.createElement("main");
+main.innerHTML = `
+        <p id="counter" data-testid="counter">0</p>
+        <button id="increment">Increment</button>
+    `;
+body.appendChild(main);