diff --git a/ci/README.md b/ci/README.md
index eef0fd4de..31fdb7e0e 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -156,9 +156,9 @@ git merge "community/$PR_BRANCH"
    familiar with the change.
 5. You should rerun the `check-merge-to-enterprise` check on
    `community/$PR_BRANCH`. You can use re-run from failed option in circle CI.
-6. You can now merge the PR on enterprise. Be sure to NOT use "squash and merge",
+6. You can now merge the PR on community. Be sure to NOT use "squash and merge",
    but instead use the regular "merge commit" mode.
-7. You can now merge the PR on community. Be sure to NOT use "squash and merge",
+7. You can now merge the PR on enterprise. Be sure to NOT use "squash and merge",
    but instead use the regular "merge commit" mode.
 
 The subsequent PRs on community will be able to pass the
diff --git a/ci/check_enterprise_merge.sh b/ci/check_enterprise_merge.sh
index 040a5c224..d29ffcad8 100755
--- a/ci/check_enterprise_merge.sh
+++ b/ci/check_enterprise_merge.sh
@@ -66,10 +66,10 @@ fi
 git merge --abort
 
 # If we have a conflict on enterprise merge on the master branch, we have a problem.
-# Provide an error message to indicate that enterprise merge is needed.
+# Provide an error message to indicate that enterprise merge is needed to fix this check.
 if [[ $PR_BRANCH = master ]]; then
-    echo "ERROR: Master branch has merge conlicts with enterprise-master."
-    echo "Try re-running this job if you merged community PR before enterprise PR. Otherwise conflicts need to be resolved as a separate PR on enterprise."
+    echo "ERROR: Master branch has merge conflicts with enterprise-master."
+    echo "Try re-running this CI job after merging your changes into enterprise-master."
     exit 1
 fi