Merge button is not available after you resolve conflicts in the UI

When there are merge conflicts, you can resolve them in the UI. After you did it, you can commmit the new version to your project. After that, there should be no more conflicts.

After the commit, the page was still saying that conflicts are there: image

Waiting some time, it just hides the merge button: image

A page refresh solved the issue: image