Bug: unsolvable conflict

[SorenB]

Hello

I am merging my main branch into my feature branch under development to catch up on changes.
During this stage I am asked to solve conflicts which normally works just fine.

However a recent conflict presented in UiPath Studio seems to be unsolvable.
The changes has been registrered on the file but there are no visible changes shown and the Save button is not clickable.
So I am unable to proceed in my conflich solving process.
It does’nt help changing left/right side.

If I take a look at changes to the file directly in my Version Control System, I can see the changes that are made.

Regards
Soren