diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3fe53051f5b..e0267ce750d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,8 +20,7 @@ commands:
             set -ex
             BRANCH=$(git rev-parse --abbrev-ref HEAD)
             if [[ "$BRANCH" != "master" ]]; then
-              git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
-              git checkout "merged/$CIRCLE_BRANCH"
+              git merge origin/master
             fi
 
 binary_common: &binary_common
diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
index cb2d9125cc7..91e0e228b5b 100644
--- a/.circleci/config.yml.in
+++ b/.circleci/config.yml.in
@@ -20,8 +20,7 @@ commands:
             set -ex
             BRANCH=$(git rev-parse --abbrev-ref HEAD)
             if [[ "$BRANCH" != "master" ]]; then
-              git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
-              git checkout "merged/$CIRCLE_BRANCH"
+              git merge origin/master
             fi
 
 binary_common: &binary_common