diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
index f29d9de..c05d293 100644
--- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
@@ -1,5 +1,6 @@
 @(issue: gitbucket.core.model.Issue,
   pullreq: gitbucket.core.model.PullRequest,
+  commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo],
   comments: List[gitbucket.core.model.Comment],
   issueLabels: List[gitbucket.core.model.Label],
   collaborators: List[String],
@@ -48,16 +49,12 @@
 </div>
 <script>
 $(function(){
-  $('#cancel-merge-pull-request').click(function(){
-    $('#confirm-merge-form').hide();
-    $('#merge-pull-request').show();
-  });
-
-  var checkConflict = $('.check-conflict').show();
-  if(checkConflict.length){
-    $.get('@helpers.url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); });
+  @if(commits.nonEmpty){
+    var checkConflict = $('.check-conflict').show();
+    if(checkConflict.length){
+      $.get('@helpers.url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); });
+    }
   }
-
   $('.delete-branch').click(function(e){
     var branchName = $(e.target).data('name');
     return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
index 0606d3e..34f9211 100644
--- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
@@ -85,13 +85,13 @@
           @flash.get("info").map{ info =>
             <div class="alert alert-info">@info</div>
           }
-          @gitbucket.core.pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository)
+          @gitbucket.core.pulls.html.conversation(issue, pullreq, commits, comments, issueLabels, collaborators, milestones, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository)
         </div>
         <div class="tab-pane" id="commits">
           @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository)
         </div>
         <div class="tab-pane" id="files">
-          @gitbucket.core.helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true, Some(pullreq.issueId), isManageable, true)
+          @gitbucket.core.helper.html.diff(diffs, repository, commits.headOption.map(_.id), commits.lastOption.map(_.id), true, Some(pullreq.issueId), isManageable, true)
         </div>
       </div>
     }
@@ -151,4 +151,4 @@
     return false;
   });
 });
-</script>
\ No newline at end of file
+</script>