All merge conflicts were resolved, but still says there are merge conflicts

Stale page content after resolving conflicts:

If you wait long enough, you'll get a message about HEAD changing, but what's weird is that this was after a page transition; going from the conflict resolution, hitting submit, then immediately seeing this page with stale content. I expected a new page load to show fresh information.