chore: fix merge errors

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
         node-version: [14, 16]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
@@ -18,7 +18,7 @@ jobs:
           version: 7.0.1
 
       - name: Set node version to ${{ matrix.node_version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node_version }}
           cache: 'pnpm'

docs/guide/markdown-extensions.md

@@ -296,7 +296,7 @@ export default { // Highlighted
 
 **Output**
 
-```js{1,4,6-8}
+```js{1,4,6-7}
 export default { // Highlighted
   data () {
     return {