title: Git: Your branch is 1 commit ahead and 5 commit behind master?
body: <p>I am working on a open source project.I first forked the project, cloned it into my machine and have made a change on the master branch directly. I committed those changes and pushed it to my fork. I then opened up a pull request for that change.
  Whenever I go to my GitHub it 
  I am 1 commit ahead and 5 commit behind the main repository.</p>
  
  <p>How do i solve this issue so that:
  I have those changes that is made in the master(original) and my changes in my local machine and my forked repository along with the changes that i have made.</p>