diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index f6c1d4a..5b10761 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -83,14 +83,15 @@
   }
   <div>
     <p>
-      <span class="strong">Step 1:</span> Check out a new branch to test the changes — run this from your project directory
+      <span class="strong">Step 1:</span> From your project repository, check out a new branch and test the changes.
     </p>
-    @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}"){ command =>
+    @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\ngit pull ${requestRepositoryUrl} ${pullreq.requestBranch}"){ command =>
       @helper.html.copy("merge-command-copy-1", command){
         <pre style="width: 500px; float: left;">@command</pre>
       }
     }
   </div>
+  @*
   <div>
     <p>
       <span class="strong">Step 2:</span> Bring in @{pullreq.requestUserName}'s changes and test
@@ -101,12 +102,13 @@
       }
     }
   </div>
+  *@
   <div>
     <p>
-      <span class="strong">Step 3:</span> Merge the changes and update the server
+      <span class="strong">Step 2:</span> Merge the changes and update on the server.
     </p>
-    @defining(s"git checkout ${pullreq.branch}\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
-      @helper.html.copy("merge-command-copy-3", command){
+    @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
+      @helper.html.copy("merge-command-copy-2", command){
         <pre style="width: 500px; float: left;">@command</pre>
       }
     }