"Resolve conflicts" button erroneously shows "Showing 0 conflict"

(We are using v13.11.1-ee )

Details

In the merge request, the Merge button is grayed out, because of conflicts.

When hitting "Resolve conflicts" button, we get the page where one can resolve the conflicts from within gitlab, but it erroneously shows "Showing 0 conflict" !!

The conflict was only in a single file, and that file is shown in gitlab, with the conflict markers:

<<<<<<< src/_build/Supra.vcxproj.filters
    <ClInclude Include="..\application\CGo.h">
      <Filter>application\sensorFunctions</Filter>
=======
    <ClInclude Include="..\..\..\shared\Bla.h">
      <Filter>shared</Filter>
>>>>>>> src/_build/Supra.vcxproj.filters
    </ClInclude>

The conflict markers above are a bit weird, because if I use the commandline to merge, I get:

<<<<<<< HEAD
    <ClInclude Include="..\application\CGo.h">
      <Filter>application\sensorFunctions</Filter>
=======
    <ClInclude Include="..\..\..\shared\Bla.h">
      <Filter>shared</Filter>
>>>>>>> master
    </ClInclude>

I don't know how the conflict markers are supposed to look in gitlab, but maby that can help to track down the bug, which is the erroneous display of "Showing 0 conflict between work/abc and master".