I have done a PR and now I am resolving a conflict on Github. After fixing the conflict I click on Mark as resolved: It says that the conflict has been resolved:
