A pull request  had three simple conflicts in one file. I resolved them in GitHub text editor, marked as resolved then committed . I see my forked branch  is merged with master but pull request still insists on conflicts and doesn’t understand that file is updated now! It still uses previous file which has conflicts.
Today it gone away itself! I don’t know why? Today we just merged another PR into master!
Hi @yasserzamani I’m glad this ended up being resolved for you!
For future reference, we have some wonderful Help Docs that might help you problem solve a merge conflict like this, if you should run into another in the future.