Impossible to solve conflict with custom resolution when content and object are involved

Reproduction steps:

• Create a document with few lines of content
• Put in that document 2 objects: an AWM.Content object and an Short string object
• Put a value in the short string object
• Open the document with the object editor in two tabs
• Modify in the first tab both the content and the Short string value and save
• Modify in the second tab the content on the same line with a different value, and put a different value for the Short string and click save

Expected result:

• the conflict modal is opening and the custom resolution cannot be chosen as there's a conflict on both the content and the object

Obtained result:

• the conflict modal is opening and it's possible to chose the custom resolution: when doing so and saving the modal, it's opening back again