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..bcdf9f9 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
@@ -1,3 +1,6 @@
+import { Header } from "./header.js";
+import { Main } from "./main.js";
+
 //increments the number in a node's text
 function increment(node) {
   let current = node.textContent;
@@ -6,19 +9,9 @@ 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>
-    `;
+  const header = Header();
+  const main = Main();
   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");
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..7f1d114
--- /dev/null
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/header.js
@@ -0,0 +1,8 @@
+export function Header() {
+  const header = document.createElement("header");
+  header.innerHTML = `
+        <h1>Number Counter</h1>
+        <p>A simple counter. Press increment to increase the count by one.</p>
+    `;
+  return 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..92a2b76
--- /dev/null
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
@@ -0,0 +1,8 @@
+export function Main() {
+  const main = document.createElement("main");
+  main.innerHTML = `
+        <p id="counter" data-testid="counter">0</p>
+        <button id="increment">Increment</button>
+    `;
+  return main;
+}