fix: merge conflicts

dkoo · dkoo · commit 9a2ed5da5413 · 2020-08-20T16:01:32.000-06:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -60,7 +60,7 @@ jobs:
     docker:
       - image: circleci/node:12
     steps:
-      - checkout_code
+      - checkout
       - run:
           name: Set tip of alpha branch on top of release and force-push it to remote
           command: |
