From 065b0e02bb5fe4328ec2600d2c97a40bcac392e5 Mon Sep 17 00:00:00 2001
From: mandip sanger <mandipsanger1@gmail.com>
Date: Sat, 25 Jul 2026 14:53:39 +0100
Subject: [PATCH 1/4] split ap.pjs

---
 .../tasks/buttons-and-counter/src/app.js       | 18 +-----------------
 1 file changed, 1 insertion(+), 17 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..c394be8 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
@@ -12,20 +12,4 @@ export function App() {
         <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", () => {
-    increment(counter);
-  });
-
-  return body;
-}
+ s
\ No newline at end of file

From 9c8720c860c99e7639ba4450e4f58e1965afe2a4 Mon Sep 17 00:00:00 2001
From: mandip sanger <mandipsanger1@gmail.com>
Date: Sat, 25 Jul 2026 14:54:08 +0100
Subject: [PATCH 2/4] header.js

---
 .../tasks/buttons-and-counter/src/header.js     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 dom-merge-conflict/tasks/buttons-and-counter/src/header.js

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..b4bd067
--- /dev/null
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/header.js
@@ -0,0 +1,17 @@
+ 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", () => {
+    increment(counter);
+  });
+
+  return body;
+}

From c5ff2e7117ca72b463a0929344402014f2547dda Mon Sep 17 00:00:00 2001
From: mandip sanger <mandipsanger1@gmail.com>
Date: Sat, 25 Jul 2026 14:54:20 +0100
Subject: [PATCH 3/4] src

---
 dom-merge-conflict/tasks/buttons-and-counter/src/src | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dom-merge-conflict/tasks/buttons-and-counter/src/src

diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/src b/dom-merge-conflict/tasks/buttons-and-counter/src/src
new file mode 100644
index 0000000..e69de29

From 35b2b34e6d2383f0a5a95d87027298d6344db3e2 Mon Sep 17 00:00:00 2001
From: mandipsanger <mandipsanger1@gmail.com>
Date: Sat, 25 Jul 2026 15:20:30 +0100
Subject: [PATCH 4/4] delete the s

---
 dom-merge-conflict/tasks/buttons-and-counter/src/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c394be8..25be5bd 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
@@ -12,4 +12,4 @@ export function App() {
         <h1>Number Counter</h1>
         <p>A simple counter. Press increment to increase the count by one.</p>
     `;
- s
\ No newline at end of file
+ 
\ No newline at end of file