title: What I can do to resolve "1 commit behind master"?
body: <p>After pushing I've been seeing this message at remote repository:</p>
  <blockquote>
  <p>1 commit behind master.</p>
  <p>This merge has conflicts that must be resolved before it can be committed.</p>
  <p>To manually merge these changes into TA20footerLast run the following commands:</p>
  <p><code>git checkout 7c891f50c557</code></p>
  <p><strong>Note</strong>: This will create a detached head!</p>
  <p><code>git merge remotes/origin/master</code></p>
  </blockquote>