Merge on save detect conflicts between object and content

Reproduction steps:

• Create a new page and save it without any content
• Open the object editor and the WYSIWYG editor in two tabs
• Add a new object in the object editor
• Add a new content in the WYSIWYG editor and click "save & continue"

Expected result:

• The save should happen successfully since the conflict edition did not happen on the same properties

Obtained result:

• A conflict window appears