title: "This pull request contains merge conflicts that must be resolved."
body: <p>I'm getting that error with a PR, but when I <code>git status</code> it says <code>nothing to commit, working directory clean</code>.</p>
  
  <p>That's on the branch with the PR.</p>
  
  <pre><code>On branch pr12
  nothing to commit, working directory clean
  </code></pre>