fix merge conflicts

.github/workflows/node CI.yml

@@ -6,9 +6,9 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -28,6 +28,12 @@ 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