Wrong custom resolution when content and object are involved

Reproduction steps:

• Create a document with content and object
• Open a new change request to change the content and perform a change on the object too
• Edit the published page to change the content and the object so that there's conflict on both
• Go to the change request and click on the link to fix the conflict

Expected result:

• There's no possibility of custom resolution choice, as there's a conflict on the object

Obtained result:

• The custom resolution choice is displayed