I was resolving one conflict in a file in another branch that is conflicting with the master branch. So after resolving conflict on github, when I clicked on commit branch.