ci: fix merge conflict

Author: gavinbarron

.github/workflows/storybook.yml

@@ -14,11 +14,7 @@ jobs:
 
     strategy:
       matrix:
-<<<<<<< HEAD
         node-version: [16.x]
-=======
-        node-version: [14.x]
->>>>>>> main
 
     steps:
       - uses: actions/checkout@v2