diff --git a/.github/workflows/node CI.yml b/.github/workflows/node CI.yml
index b13c00f..7e7a259 100644
--- a/.github/workflows/node CI.yml	
+++ b/.github/workflows/node CI.yml	
@@ -28,12 +28,8 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-<<<<<<< HEAD
           node-version: '18.x'
       - name: run Prettier
         run: npx prettier --check .
-=======
-          node-version: "18.x"
->>>>>>> 229a8cf (format all with prettier)
       - name: Run npm
         run: npm install && npm run build
diff --git a/package.json b/package.json
index b7b8da0..bf7e48d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,9 @@
     "watch": "eleventy --watch",
     "serve": "eleventy --serve",
     "start": "eleventy --serve",
-    "debug": "DEBUG=* eleventy"
+    "debug": "DEBUG=* eleventy",
+    "prettier-write": "npx prettier --write --ignore-unknown .",
+    "prettier-check": "npx prettier --check ."
   },
   "repository": {
     "type": "git",